From a676ed5d996973c183f04deadb7769fb3a1812e0 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Thu, 31 Oct 2019 14:57:35 +0100
Subject: [PATCH] update expand-region

---
 bba.org                                       |   2 +-
 .../expand-region-autoloads.el                | 296 ------------------
 .../expand-region-pkg.el                      |   4 -
 .../cc-mode-expansions.el                     |   0
 .../clojure-mode-expansions.el                |   0
 .../cperl-mode-expansions.el                  |   0
 .../css-mode-expansions.el                    |   0
 .../enh-ruby-mode-expansions.el               |   0
 .../er-basic-expansions.el                    |   0
 .../erlang-mode-expansions.el                 |   0
 .../expand-region-autoloads.el                | 107 +++++++
 .../expand-region-core.el                     |  20 +-
 .../expand-region-custom.el                   |  11 +
 .../expand-region-pkg.el                      |   4 +
 .../expand-region.el                          |   2 +-
 .../feature-mode-expansions.el                |   0
 .../html-mode-expansions.el                   |   0
 .../js-mode-expansions.el                     |   0
 .../js2-mode-expansions.el                    |   0
 .../jsp-expansions.el                         |   0
 .../latex-mode-expansions.el                  |   0
 .../nxml-mode-expansions.el                   |   0
 .../octave-expansions.el                      |   0
 .../python-el-expansions.el                   |   0
 .../python-el-fgallina-expansions.el          |   0
 .../python-mode-expansions.el                 |   0
 .../ruby-mode-expansions.el                   |   0
 .../sml-mode-expansions.el                    |   0
 .../subword-mode-expansions.el                |  12 +-
 .../text-mode-expansions.el                   |   0
 .../the-org-mode-expansions.el                |  10 +-
 .../web-mode-expansions.el                    |   4 +-
 32 files changed, 162 insertions(+), 310 deletions(-)
 delete mode 100644 elpa/expand-region-20180817.1134/expand-region-autoloads.el
 delete mode 100644 elpa/expand-region-20180817.1134/expand-region-pkg.el
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/cc-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/clojure-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/cperl-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/css-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/enh-ruby-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/er-basic-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/erlang-mode-expansions.el (100%)
 create mode 100644 elpa/expand-region-20190416.538/expand-region-autoloads.el
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/expand-region-core.el (94%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/expand-region-custom.el (90%)
 create mode 100644 elpa/expand-region-20190416.538/expand-region-pkg.el
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/expand-region.el (99%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/feature-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/html-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/js-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/js2-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/jsp-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/latex-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/nxml-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/octave-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/python-el-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/python-el-fgallina-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/python-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/ruby-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/sml-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/subword-mode-expansions.el (85%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/text-mode-expansions.el (100%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/the-org-mode-expansions.el (89%)
 rename elpa/{expand-region-20180817.1134 => expand-region-20190416.538}/web-mode-expansions.el (91%)

diff --git a/bba.org b/bba.org
index e230cb8f..d2a2efe8 100644
--- a/bba.org
+++ b/bba.org
@@ -522,7 +522,7 @@ search the web on your fingertips. C-c /.
 #+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
-        (add-to-list 'load-path "~/.emacs.d/elpa/expand-region-20180817.1134")
+        (add-to-list 'load-path "~/.emacs.d/elpa/expand-region-20190416.538")
         (require 'expand-region)
         (define-key global-map (kbd "C-c C-<f12>") 'er/contract-region )
         (define-key global-map (kbd "C-c <f12>") 'er/expand-region )
diff --git a/elpa/expand-region-20180817.1134/expand-region-autoloads.el b/elpa/expand-region-20180817.1134/expand-region-autoloads.el
deleted file mode 100644
index 16e33685..00000000
--- a/elpa/expand-region-20180817.1134/expand-region-autoloads.el
+++ /dev/null
@@ -1,296 +0,0 @@
-;;; expand-region-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-(add-to-list 'load-path (directory-file-name
-                         (or (file-name-directory #$) (car load-path))))
-
-
-;;;### (autoloads nil "cc-mode-expansions" "cc-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from cc-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "cc-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "clojure-mode-expansions" "clojure-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from clojure-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "clojure-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "cperl-mode-expansions" "cperl-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from cperl-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "cperl-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "css-mode-expansions" "css-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from css-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "css-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "enh-ruby-mode-expansions" "enh-ruby-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from enh-ruby-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "enh-ruby-mode-expansions" '("er/add-enh-ruby-mode-expansions")))
-
-;;;***
-
-;;;### (autoloads nil "er-basic-expansions" "er-basic-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from er-basic-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "er-basic-expansions" '("er--" "er/mark-")))
-
-;;;***
-
-;;;### (autoloads nil "erlang-mode-expansions" "erlang-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from erlang-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "erlang-mode-expansions" '("er/add-erlang-mode-expansions")))
-
-;;;***
-
-;;;### (autoloads nil "expand-region" "expand-region.el" (0 0 0 0))
-;;; Generated autoloads from expand-region.el
-
-(autoload 'er/expand-region "expand-region" "\
-Increase selected region by semantic units.
-
-With prefix argument expands the region that many times.
-If prefix argument is negative calls `er/contract-region'.
-If prefix argument is 0 it resets point and mark to their state
-before calling `er/expand-region' for the first time.
-
-\(fn ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "expand-region-core" "expand-region-core.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from expand-region-core.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "expand-region-core" '("er--" "er/")))
-
-;;;***
-
-;;;### (autoloads nil "expand-region-custom" "expand-region-custom.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from expand-region-custom.el
-
-(let ((loads (get 'expand-region 'custom-loads))) (if (member '"expand-region-custom" loads) nil (put 'expand-region 'custom-loads (cons '"expand-region-custom" loads))))
-
-(defvar expand-region-preferred-python-mode 'python "\
-The name of your preferred python mode")
-
-(custom-autoload 'expand-region-preferred-python-mode "expand-region-custom" t)
-
-(defvar expand-region-guess-python-mode t "\
-If expand-region should attempt to guess your preferred python mode")
-
-(custom-autoload 'expand-region-guess-python-mode "expand-region-custom" t)
-
-(defvar expand-region-autocopy-register "" "\
-If set to a string of a single character (try \"e\"), then the
-contents of the most recent expand or contract command will
-always be copied to the register named after that character.")
-
-(custom-autoload 'expand-region-autocopy-register "expand-region-custom" t)
-
-(defvar expand-region-skip-whitespace t "\
-If expand-region should skip past whitespace on initial expansion")
-
-(custom-autoload 'expand-region-skip-whitespace "expand-region-custom" t)
-
-(defvar expand-region-fast-keys-enabled t "\
-If expand-region should bind fast keys after initial expand/contract")
-
-(custom-autoload 'expand-region-fast-keys-enabled "expand-region-custom" t)
-
-(defvar expand-region-contract-fast-key "-" "\
-Key to use after an initial expand/contract to contract once more.")
-
-(custom-autoload 'expand-region-contract-fast-key "expand-region-custom" t)
-
-(defvar expand-region-reset-fast-key "0" "\
-Key to use after an initial expand/contract to undo.")
-
-(custom-autoload 'expand-region-reset-fast-key "expand-region-custom" t)
-
-(defvar expand-region-exclude-text-mode-expansions '(html-mode nxml-mode) "\
-List of modes which derive from `text-mode' for which text mode expansions are not appropriate.")
-
-(custom-autoload 'expand-region-exclude-text-mode-expansions "expand-region-custom" t)
-
-(defvar expand-region-smart-cursor nil "\
-Defines whether the cursor should be placed intelligently after expansion.
-
-If set to t, and the cursor is already at the beginning of the new region,
-keep it there; otherwise, put it at the end of the region.
-
-If set to nil, always place the cursor at the beginning of the region.")
-
-(custom-autoload 'expand-region-smart-cursor "expand-region-custom" t)
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "expand-region-custom" '("expand-region-guess-python-mode")))
-
-;;;***
-
-;;;### (autoloads nil "feature-mode-expansions" "feature-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from feature-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "feature-mode-expansions" '("er--block-between-keywords" "er/")))
-
-;;;***
-
-;;;### (autoloads nil "html-mode-expansions" "html-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from html-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "html-mode-expansions" '("er--" "er/")))
-
-;;;***
-
-;;;### (autoloads nil "js-mode-expansions" "js-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from js-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "js-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "js2-mode-expansions" "js2-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from js2-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "js2-mode-expansions" '("er/add-js2-mode-expansions" "js2-mark-parent-statement")))
-
-;;;***
-
-;;;### (autoloads nil "jsp-expansions" "jsp-expansions.el" (0 0 0
-;;;;;;  0))
-;;; Generated autoloads from jsp-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "jsp-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "latex-mode-expansions" "latex-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from latex-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "latex-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "nxml-mode-expansions" "nxml-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from nxml-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "nxml-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "octave-expansions" "octave-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from octave-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "octave-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "python-el-expansions" "python-el-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from python-el-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "python-el-expansions" '("er--python-string-delimiter" "er/")))
-
-;;;***
-
-;;;### (autoloads nil "python-el-fgallina-expansions" "python-el-fgallina-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from python-el-fgallina-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "python-el-fgallina-expansions" '("er--python-" "er/")))
-
-;;;***
-
-;;;### (autoloads nil "python-mode-expansions" "python-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from python-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "python-mode-expansions" '("er--" "er/" "py-goto-beyond-clause")))
-
-;;;***
-
-;;;### (autoloads nil "ruby-mode-expansions" "ruby-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ruby-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ruby-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "sml-mode-expansions" "sml-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from sml-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "sml-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "subword-mode-expansions" "subword-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from subword-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "subword-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "text-mode-expansions" "text-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from text-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "text-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "the-org-mode-expansions" "the-org-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from the-org-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "the-org-mode-expansions" '("er/")))
-
-;;;***
-
-;;;### (autoloads nil "web-mode-expansions" "web-mode-expansions.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from web-mode-expansions.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "web-mode-expansions" '("er/add-web-mode-expansions")))
-
-;;;***
-
-;;;### (autoloads nil nil ("expand-region-pkg.el") (0 0 0 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; expand-region-autoloads.el ends here
diff --git a/elpa/expand-region-20180817.1134/expand-region-pkg.el b/elpa/expand-region-20180817.1134/expand-region-pkg.el
deleted file mode 100644
index baae31d6..00000000
--- a/elpa/expand-region-20180817.1134/expand-region-pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(define-package "expand-region" "20180817.1134" "Increase selected region by semantic units." 'nil)
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/elpa/expand-region-20180817.1134/cc-mode-expansions.el b/elpa/expand-region-20190416.538/cc-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/cc-mode-expansions.el
rename to elpa/expand-region-20190416.538/cc-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/clojure-mode-expansions.el b/elpa/expand-region-20190416.538/clojure-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/clojure-mode-expansions.el
rename to elpa/expand-region-20190416.538/clojure-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/cperl-mode-expansions.el b/elpa/expand-region-20190416.538/cperl-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/cperl-mode-expansions.el
rename to elpa/expand-region-20190416.538/cperl-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/css-mode-expansions.el b/elpa/expand-region-20190416.538/css-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/css-mode-expansions.el
rename to elpa/expand-region-20190416.538/css-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/enh-ruby-mode-expansions.el b/elpa/expand-region-20190416.538/enh-ruby-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/enh-ruby-mode-expansions.el
rename to elpa/expand-region-20190416.538/enh-ruby-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/er-basic-expansions.el b/elpa/expand-region-20190416.538/er-basic-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/er-basic-expansions.el
rename to elpa/expand-region-20190416.538/er-basic-expansions.el
diff --git a/elpa/expand-region-20180817.1134/erlang-mode-expansions.el b/elpa/expand-region-20190416.538/erlang-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/erlang-mode-expansions.el
rename to elpa/expand-region-20190416.538/erlang-mode-expansions.el
diff --git a/elpa/expand-region-20190416.538/expand-region-autoloads.el b/elpa/expand-region-20190416.538/expand-region-autoloads.el
new file mode 100644
index 00000000..a19b0fdf
--- /dev/null
+++ b/elpa/expand-region-20190416.538/expand-region-autoloads.el
@@ -0,0 +1,107 @@
+;;; expand-region-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
+
+;;;### (autoloads nil "expand-region" "expand-region.el" (23994 46760
+;;;;;;  125331 949000))
+;;; Generated autoloads from expand-region.el
+
+(autoload 'er/expand-region "expand-region" "\
+Increase selected region by semantic units.
+
+With prefix argument expands the region that many times.
+If prefix argument is negative calls `er/contract-region'.
+If prefix argument is 0 it resets point and mark to their state
+before calling `er/expand-region' for the first time.
+
+\(fn ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "expand-region-custom" "expand-region-custom.el"
+;;;;;;  (23994 46760 111844 235000))
+;;; Generated autoloads from expand-region-custom.el
+
+(let ((loads (get 'expand-region 'custom-loads))) (if (member '"expand-region-custom" loads) nil (put 'expand-region 'custom-loads (cons '"expand-region-custom" loads))))
+
+(defvar expand-region-preferred-python-mode 'python "\
+The name of your preferred python mode")
+
+(custom-autoload 'expand-region-preferred-python-mode "expand-region-custom" t)
+
+(defvar expand-region-guess-python-mode t "\
+If expand-region should attempt to guess your preferred python mode")
+
+(custom-autoload 'expand-region-guess-python-mode "expand-region-custom" t)
+
+(defvar expand-region-autocopy-register "" "\
+If set to a string of a single character (try \"e\"), then the
+contents of the most recent expand or contract command will
+always be copied to the register named after that character.")
+
+(custom-autoload 'expand-region-autocopy-register "expand-region-custom" t)
+
+(defvar expand-region-skip-whitespace t "\
+If expand-region should skip past whitespace on initial expansion")
+
+(custom-autoload 'expand-region-skip-whitespace "expand-region-custom" t)
+
+(defvar expand-region-fast-keys-enabled t "\
+If expand-region should bind fast keys after initial expand/contract")
+
+(custom-autoload 'expand-region-fast-keys-enabled "expand-region-custom" t)
+
+(defvar expand-region-contract-fast-key "-" "\
+Key to use after an initial expand/contract to contract once more.")
+
+(custom-autoload 'expand-region-contract-fast-key "expand-region-custom" t)
+
+(defvar expand-region-reset-fast-key "0" "\
+Key to use after an initial expand/contract to undo.")
+
+(custom-autoload 'expand-region-reset-fast-key "expand-region-custom" t)
+
+(defvar expand-region-exclude-text-mode-expansions '(html-mode nxml-mode) "\
+List of modes which derive from `text-mode' for which text mode expansions are not appropriate.")
+
+(custom-autoload 'expand-region-exclude-text-mode-expansions "expand-region-custom" t)
+
+(defvar expand-region-smart-cursor nil "\
+Defines whether the cursor should be placed intelligently after expansion.
+
+If set to t, and the cursor is already at the beginning of the new region,
+keep it there; otherwise, put it at the end of the region.
+
+If set to nil, always place the cursor at the beginning of the region.")
+
+(custom-autoload 'expand-region-smart-cursor "expand-region-custom" t)
+
+(define-obsolete-variable-alias 'er/enable-subword-mode\? 'expand-region-subword-enabled "2019-03-23")
+
+(defvar expand-region-subword-enabled nil "\
+Whether expand-region should use subword expansions.")
+
+(custom-autoload 'expand-region-subword-enabled "expand-region-custom" t)
+
+;;;***
+
+;;;### (autoloads nil nil ("cc-mode-expansions.el" "clojure-mode-expansions.el"
+;;;;;;  "cperl-mode-expansions.el" "css-mode-expansions.el" "enh-ruby-mode-expansions.el"
+;;;;;;  "er-basic-expansions.el" "erlang-mode-expansions.el" "expand-region-core.el"
+;;;;;;  "expand-region-pkg.el" "feature-mode-expansions.el" "html-mode-expansions.el"
+;;;;;;  "js-mode-expansions.el" "js2-mode-expansions.el" "jsp-expansions.el"
+;;;;;;  "latex-mode-expansions.el" "nxml-mode-expansions.el" "octave-expansions.el"
+;;;;;;  "python-el-expansions.el" "python-el-fgallina-expansions.el"
+;;;;;;  "python-mode-expansions.el" "ruby-mode-expansions.el" "sml-mode-expansions.el"
+;;;;;;  "subword-mode-expansions.el" "text-mode-expansions.el" "the-org-mode-expansions.el"
+;;;;;;  "web-mode-expansions.el") (23994 46760 127624 994000))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; expand-region-autoloads.el ends here
diff --git a/elpa/expand-region-20180817.1134/expand-region-core.el b/elpa/expand-region-20190416.538/expand-region-core.el
similarity index 94%
rename from elpa/expand-region-20180817.1134/expand-region-core.el
rename to elpa/expand-region-20190416.538/expand-region-core.el
index a542a703..2864b9a9 100644
--- a/elpa/expand-region-20180817.1134/expand-region-core.el
+++ b/elpa/expand-region-20190416.538/expand-region-core.el
@@ -44,6 +44,9 @@
 (defvar er/try-expand-list nil
   "A list of functions that are tried when expanding.")
 
+(defvar er/save-mode-excursion nil
+  "A function to save excursion state when expanding.")
+
 (defun er--prepare-expanding ()
   (when (and (er--first-invocation)
              (not (use-region-p)))
@@ -65,6 +68,13 @@
     (defmacro save-mark-and-excursion (&rest body)
       `(save-excursion ,@body))))
 
+(defmacro er--save-excursion (&rest body)
+  `(let ((action (lambda ()
+                   (save-mark-and-excursion ,@body))))
+     (if er/save-mode-excursion
+         (funcall er/save-mode-excursion action)
+       (funcall action))))
+
 (defun er--expand-region-1 ()
   "Increase selected region by semantic units.
 Basically it runs all the mark-functions in `er/try-expand-list'
@@ -96,7 +106,7 @@ moving point or mark as little as possible."
       (setq start (point)))
 
     (while try-list
-      (save-mark-and-excursion
+      (er--save-excursion
        (ignore-errors
          (funcall (car try-list))
          (when (and (region-active-p)
@@ -279,6 +289,14 @@ remove the keymap depends on user input and KEEP-PRED:
         (when (derived-mode-p mode)
           (funcall add-fn))))))
 
+(defun er/enable-minor-mode-expansions (mode add-fn)
+  (add-hook (intern (format "%s-hook" mode)) add-fn)
+  (save-window-excursion
+    (dolist (buffer (buffer-list))
+      (with-current-buffer buffer
+        (when (symbol-value mode)
+          (funcall add-fn))))))
+
 ;; Some more performant version of `looking-back'
 
 (defun er/looking-back-on-line (regexp)
diff --git a/elpa/expand-region-20180817.1134/expand-region-custom.el b/elpa/expand-region-20190416.538/expand-region-custom.el
similarity index 90%
rename from elpa/expand-region-20180817.1134/expand-region-custom.el
rename to elpa/expand-region-20190416.538/expand-region-custom.el
index e4a1fdd1..6d01bd2d 100644
--- a/elpa/expand-region-20180817.1134/expand-region-custom.el
+++ b/elpa/expand-region-20190416.538/expand-region-custom.el
@@ -104,6 +104,17 @@ If set to nil, always place the cursor at the beginning of the region."
   :type '(choice (const :tag "Smart behaviour" t)
                  (const :tag "Standard behaviour" nil)))
 
+;;;###autoload
+(define-obsolete-variable-alias 'er/enable-subword-mode?
+  'expand-region-subword-enabled "2019-03-23")
+
+;;;###autoload
+(defcustom expand-region-subword-enabled nil
+  "Whether expand-region should use subword expansions."
+  :group 'expand-region
+  :type '(choice (const :tag "Enable subword expansions" t)
+                 (const :tag "Disable subword expansions" nil)))
+
 (provide 'expand-region-custom)
 
 ;;; expand-region-custom.el ends here
diff --git a/elpa/expand-region-20190416.538/expand-region-pkg.el b/elpa/expand-region-20190416.538/expand-region-pkg.el
new file mode 100644
index 00000000..ad65aefc
--- /dev/null
+++ b/elpa/expand-region-20190416.538/expand-region-pkg.el
@@ -0,0 +1,4 @@
+(define-package "expand-region" "20190416.538" "Increase selected region by semantic units." 'nil)
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/elpa/expand-region-20180817.1134/expand-region.el b/elpa/expand-region-20190416.538/expand-region.el
similarity index 99%
rename from elpa/expand-region-20180817.1134/expand-region.el
rename to elpa/expand-region-20190416.538/expand-region.el
index 56efef29..1c6d4b44 100644
--- a/elpa/expand-region-20180817.1134/expand-region.el
+++ b/elpa/expand-region-20190416.538/expand-region.el
@@ -189,7 +189,7 @@ before calling `er/expand-region' for the first time."
 (eval-after-load 'cperl-mode     '(require 'cperl-mode-expansions))
 (eval-after-load 'sml-mode       '(require 'sml-mode-expansions))
 (eval-after-load 'enh-ruby-mode  '(require 'enh-ruby-mode-expansions))
-(eval-after-load 'subword-mode   '(require 'subword-mode-expansions))
+(eval-after-load 'subword        '(require 'subword-mode-expansions))
 
 (provide 'expand-region)
 
diff --git a/elpa/expand-region-20180817.1134/feature-mode-expansions.el b/elpa/expand-region-20190416.538/feature-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/feature-mode-expansions.el
rename to elpa/expand-region-20190416.538/feature-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/html-mode-expansions.el b/elpa/expand-region-20190416.538/html-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/html-mode-expansions.el
rename to elpa/expand-region-20190416.538/html-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/js-mode-expansions.el b/elpa/expand-region-20190416.538/js-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/js-mode-expansions.el
rename to elpa/expand-region-20190416.538/js-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/js2-mode-expansions.el b/elpa/expand-region-20190416.538/js2-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/js2-mode-expansions.el
rename to elpa/expand-region-20190416.538/js2-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/jsp-expansions.el b/elpa/expand-region-20190416.538/jsp-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/jsp-expansions.el
rename to elpa/expand-region-20190416.538/jsp-expansions.el
diff --git a/elpa/expand-region-20180817.1134/latex-mode-expansions.el b/elpa/expand-region-20190416.538/latex-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/latex-mode-expansions.el
rename to elpa/expand-region-20190416.538/latex-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/nxml-mode-expansions.el b/elpa/expand-region-20190416.538/nxml-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/nxml-mode-expansions.el
rename to elpa/expand-region-20190416.538/nxml-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/octave-expansions.el b/elpa/expand-region-20190416.538/octave-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/octave-expansions.el
rename to elpa/expand-region-20190416.538/octave-expansions.el
diff --git a/elpa/expand-region-20180817.1134/python-el-expansions.el b/elpa/expand-region-20190416.538/python-el-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/python-el-expansions.el
rename to elpa/expand-region-20190416.538/python-el-expansions.el
diff --git a/elpa/expand-region-20180817.1134/python-el-fgallina-expansions.el b/elpa/expand-region-20190416.538/python-el-fgallina-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/python-el-fgallina-expansions.el
rename to elpa/expand-region-20190416.538/python-el-fgallina-expansions.el
diff --git a/elpa/expand-region-20180817.1134/python-mode-expansions.el b/elpa/expand-region-20190416.538/python-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/python-mode-expansions.el
rename to elpa/expand-region-20190416.538/python-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/ruby-mode-expansions.el b/elpa/expand-region-20190416.538/ruby-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/ruby-mode-expansions.el
rename to elpa/expand-region-20190416.538/ruby-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/sml-mode-expansions.el b/elpa/expand-region-20190416.538/sml-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/sml-mode-expansions.el
rename to elpa/expand-region-20190416.538/sml-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/subword-mode-expansions.el b/elpa/expand-region-20190416.538/subword-mode-expansions.el
similarity index 85%
rename from elpa/expand-region-20180817.1134/subword-mode-expansions.el
rename to elpa/expand-region-20190416.538/subword-mode-expansions.el
index 8416021b..cf88f78d 100644
--- a/elpa/expand-region-20180817.1134/subword-mode-expansions.el
+++ b/elpa/expand-region-20190416.538/subword-mode-expansions.el
@@ -34,17 +34,19 @@
 (defun er/mark-subword ()
   "Mark a subword, a part of a CamelCase identifier."
   (interactive)
-  (subword-right 1)
-  (set-mark (point))
-  (subword-left 1))
+  (when (and subword-mode
+             expand-region-subword-enabled)
+    (subword-right 1)
+    (set-mark (point))
+    (subword-left 1)))
 
 (defun er/add-subword-mode-expansions ()
   "Add expansions for buffers in `subword-mode'."
   (set (make-local-variable 'er/try-expand-list)
        (append er/try-expand-list
-	       '(er/mark-subword))))
+               '(er/mark-subword))))
 
-(er/enable-mode-expansions 'subword-mode 'er/add-subword-mode-expansions)
+(er/enable-minor-mode-expansions 'subword-mode 'er/add-subword-mode-expansions)
 
 (provide 'subword-mode-expansions)
 ;;; subword-mode-expansions.el ends here
diff --git a/elpa/expand-region-20180817.1134/text-mode-expansions.el b/elpa/expand-region-20190416.538/text-mode-expansions.el
similarity index 100%
rename from elpa/expand-region-20180817.1134/text-mode-expansions.el
rename to elpa/expand-region-20190416.538/text-mode-expansions.el
diff --git a/elpa/expand-region-20180817.1134/the-org-mode-expansions.el b/elpa/expand-region-20190416.538/the-org-mode-expansions.el
similarity index 89%
rename from elpa/expand-region-20180817.1134/the-org-mode-expansions.el
rename to elpa/expand-region-20190416.538/the-org-mode-expansions.el
index 48dfce5b..fc2d6744 100644
--- a/elpa/expand-region-20180817.1134/the-org-mode-expansions.el
+++ b/elpa/expand-region-20190416.538/the-org-mode-expansions.el
@@ -32,6 +32,7 @@
 ;;; Code:
 
 (require 'expand-region-core)
+(require 'org-macs)
 
 (declare-function org-up-element "org")
 (declare-function org-mark-subtree "org")
@@ -71,6 +72,11 @@
   (org-up-element)
   (org-mark-subtree))
 
+(defun er/save-org-mode-excursion (action)
+  "Save outline visibility while expanding in org-mode"
+  (org-save-outline-visibility t
+    (funcall action)))
+
 (defun er/add-org-mode-expansions ()
   "Adds org-specific expansions for buffers in org-mode"
   (set (make-local-variable 'er/try-expand-list)
@@ -80,7 +86,9 @@
           er/mark-org-code-block
           er/mark-sentence
           er/mark-org-parent
-          er/mark-paragraph))))
+          er/mark-paragraph)))
+  (set (make-local-variable 'er/save-mode-excursion)
+       #'er/save-org-mode-excursion))
 
 (er/enable-mode-expansions 'org-mode 'er/add-org-mode-expansions)
 
diff --git a/elpa/expand-region-20180817.1134/web-mode-expansions.el b/elpa/expand-region-20190416.538/web-mode-expansions.el
similarity index 91%
rename from elpa/expand-region-20180817.1134/web-mode-expansions.el
rename to elpa/expand-region-20190416.538/web-mode-expansions.el
index 44dd0945..fc099d4e 100644
--- a/elpa/expand-region-20180817.1134/web-mode-expansions.el
+++ b/elpa/expand-region-20190416.538/web-mode-expansions.el
@@ -21,10 +21,12 @@
 
 ;;; Code:
 
+(require 'expand-region-core)
+
 (defun er/add-web-mode-expansions ()
   (set (make-local-variable 'er/try-expand-list)
        (cons 'web-mode-mark-and-expand er/try-expand-list)))
 
-(add-hook 'web-mode-hook 'er/add-web-mode-expansions)
+(er/enable-mode-expansions 'web-mode 'er/add-web-mode-expansions)
 
 (provide 'web-mode-expansions)
-- 
2.47.3