From 1c6aeb8493e5b3906897d4b5372dd89daac917f6 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 13 Nov 2018 11:35:29 +0100 Subject: [PATCH] update expand-region. Signed-off-by: Andreas Gerler --- bba.org | 2 +- .../expand-region-autoloads.el | 90 ------ .../expand-region-pkg.el | 4 - .../cc-mode-expansions.el | 2 +- .../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 | 3 +- .../erlang-mode-expansions.el | 0 .../expand-region-autoloads.el | 296 ++++++++++++++++++ .../expand-region-core.el | 26 +- .../expand-region-custom.el | 12 + .../expand-region-pkg.el | 4 + .../expand-region.el | 52 +-- .../feature-mode-expansions.el | 0 .../html-mode-expansions.el | 0 .../js-mode-expansions.el | 0 .../js2-mode-expansions.el | 0 .../jsp-expansions.el | 2 +- .../latex-mode-expansions.el | 0 .../nxml-mode-expansions.el | 10 +- .../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 | 1 + .../text-mode-expansions.el | 0 .../the-org-mode-expansions.el | 15 +- .../web-mode-expansions.el | 3 +- 32 files changed, 374 insertions(+), 148 deletions(-) delete mode 100644 elpa/expand-region-20150525.205/expand-region-autoloads.el delete mode 100644 elpa/expand-region-20150525.205/expand-region-pkg.el rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/cc-mode-expansions.el (99%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/clojure-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/cperl-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/css-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/enh-ruby-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/er-basic-expansions.el (98%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/erlang-mode-expansions.el (100%) create mode 100644 elpa/expand-region-20180817.1134/expand-region-autoloads.el rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/expand-region-core.el (93%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/expand-region-custom.el (87%) create mode 100644 elpa/expand-region-20180817.1134/expand-region-pkg.el rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/expand-region.el (80%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/feature-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/html-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/js-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/js2-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/jsp-expansions.el (96%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/latex-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/nxml-mode-expansions.el (93%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/octave-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/python-el-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/python-el-fgallina-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/python-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/ruby-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/sml-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/subword-mode-expansions.el (98%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/text-mode-expansions.el (100%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/the-org-mode-expansions.el (83%) rename elpa/{expand-region-20150525.205 => expand-region-20180817.1134}/web-mode-expansions.el (92%) diff --git a/bba.org b/bba.org index 31e25549..6a42a61a 100644 --- a/bba.org +++ b/bba.org @@ -477,7 +477,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-20150525.205") + (add-to-list 'load-path "~/.emacs.d/elpa/expand-region-20180817.1134") (require 'expand-region) (define-key global-map (kbd "C-c C-") 'er/contract-region ) (define-key global-map (kbd "C-c ") 'er/expand-region ) diff --git a/elpa/expand-region-20150525.205/expand-region-autoloads.el b/elpa/expand-region-20150525.205/expand-region-autoloads.el deleted file mode 100644 index 73e8ed05..00000000 --- a/elpa/expand-region-20150525.205/expand-region-autoloads.el +++ /dev/null @@ -1,90 +0,0 @@ -;;; expand-region-autoloads.el --- automatically extracted autoloads -;; -;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) - -;;;### (autoloads nil "expand-region" "expand-region.el" (21908 14274 -;;;;;; 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-custom" "expand-region-custom.el" -;;;;;; (21908 14275 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) - -;;;*** - -;;;### (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") (21908 14275 654619 0)) - -;;;*** - -;; 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-20150525.205/expand-region-pkg.el b/elpa/expand-region-20150525.205/expand-region-pkg.el deleted file mode 100644 index 6cd63434..00000000 --- a/elpa/expand-region-20150525.205/expand-region-pkg.el +++ /dev/null @@ -1,4 +0,0 @@ -(define-package "expand-region" "20150525.205" "Increase selected region by semantic units." 'nil) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/expand-region-20150525.205/cc-mode-expansions.el b/elpa/expand-region-20180817.1134/cc-mode-expansions.el similarity index 99% rename from elpa/expand-region-20150525.205/cc-mode-expansions.el rename to elpa/expand-region-20180817.1134/cc-mode-expansions.el index b96543ff..9effbecc 100644 --- a/elpa/expand-region-20150525.205/cc-mode-expansions.el +++ b/elpa/expand-region-20180817.1134/cc-mode-expansions.el @@ -71,7 +71,7 @@ either fully inside or fully outside the statement." (let (beg end) ;; Determine boundaries of the outside-pairs region - (save-excursion + (save-mark-and-excursion (c-end-of-statement) (er/mark-outside-pairs) (setq beg (point) diff --git a/elpa/expand-region-20150525.205/clojure-mode-expansions.el b/elpa/expand-region-20180817.1134/clojure-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/clojure-mode-expansions.el rename to elpa/expand-region-20180817.1134/clojure-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/cperl-mode-expansions.el b/elpa/expand-region-20180817.1134/cperl-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/cperl-mode-expansions.el rename to elpa/expand-region-20180817.1134/cperl-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/css-mode-expansions.el b/elpa/expand-region-20180817.1134/css-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/css-mode-expansions.el rename to elpa/expand-region-20180817.1134/css-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/enh-ruby-mode-expansions.el b/elpa/expand-region-20180817.1134/enh-ruby-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/enh-ruby-mode-expansions.el rename to elpa/expand-region-20180817.1134/enh-ruby-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/er-basic-expansions.el b/elpa/expand-region-20180817.1134/er-basic-expansions.el similarity index 98% rename from elpa/expand-region-20150525.205/er-basic-expansions.el rename to elpa/expand-region-20180817.1134/er-basic-expansions.el index dd0f9cfd..836d7372 100644 --- a/elpa/expand-region-20150525.205/er-basic-expansions.el +++ b/elpa/expand-region-20180817.1134/er-basic-expansions.el @@ -189,7 +189,8 @@ period and marks next symbol." (defun er/mark-outside-pairs () "Mark pairs (as defined by the mode), including the pair chars." (interactive) - (if (er/looking-back-on-line "\\s)+\\=") + (if (and (er/looking-back-on-line "\\s)+\\=") + (not (er--looking-at-pair))) (ignore-errors (backward-list 1)) (skip-chars-forward er--space-str)) (when (and (er--point-inside-pairs-p) diff --git a/elpa/expand-region-20150525.205/erlang-mode-expansions.el b/elpa/expand-region-20180817.1134/erlang-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/erlang-mode-expansions.el rename to elpa/expand-region-20180817.1134/erlang-mode-expansions.el diff --git a/elpa/expand-region-20180817.1134/expand-region-autoloads.el b/elpa/expand-region-20180817.1134/expand-region-autoloads.el new file mode 100644 index 00000000..16e33685 --- /dev/null +++ b/elpa/expand-region-20180817.1134/expand-region-autoloads.el @@ -0,0 +1,296 @@ +;;; 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-20150525.205/expand-region-core.el b/elpa/expand-region-20180817.1134/expand-region-core.el similarity index 93% rename from elpa/expand-region-20150525.205/expand-region-core.el rename to elpa/expand-region-20180817.1134/expand-region-core.el index 5f3c4d9d..a542a703 100644 --- a/elpa/expand-region-20150525.205/expand-region-core.el +++ b/elpa/expand-region-20180817.1134/expand-region-core.el @@ -50,8 +50,8 @@ (push-mark nil t) ;; one for keeping starting position (push-mark nil t)) ;; one for replace by set-mark in expansions - (when (not (eq t transient-mark-mode)) - (setq transient-mark-mode (cons 'only transient-mark-mode)))) + (when (not transient-mark-mode) + (setq-local transient-mark-mode (cons 'only transient-mark-mode)))) (defun er--copy-region-to-register () (when (and (stringp expand-region-autocopy-register) @@ -61,7 +61,7 @@ ;; save-mark-and-excursion in Emacs 25 works like save-excursion did before (eval-when-compile - (when (not (fboundp 'save-mark-and-excursion)) + (when (< emacs-major-version 25) (defmacro save-mark-and-excursion (&rest body) `(save-excursion ,@body)))) @@ -87,7 +87,7 @@ moving point or mark as little as possible." ;; unless we're already at maximum size (unless (and (= start best-start) (= end best-end)) - (push (cons start end) er/history)) + (push (cons p1 p2) er/history)) (when (and expand-region-skip-whitespace (er--point-is-surrounded-by-white-space) @@ -108,8 +108,13 @@ moving point or mark as little as possible." (setq try-list (cdr try-list))) (setq deactivate-mark nil) - (goto-char best-start) - (set-mark best-end) + ;; if smart cursor enabled, decide to put it at start or end of region: + (if (and expand-region-smart-cursor + (not (= start best-start))) + (progn (goto-char best-end) + (set-mark best-start)) + (goto-char best-start) + (set-mark best-end)) (er--copy-region-to-register) @@ -145,7 +150,7 @@ before calling `er/expand-region' for the first time." (setq arg (length er/history))) (when (not transient-mark-mode) - (setq transient-mark-mode (cons 'only transient-mark-mode))) + (setq-local transient-mark-mode (cons 'only transient-mark-mode))) ;; Advance through the list the desired distance (while (and (cdr er/history) @@ -188,7 +193,7 @@ before calling `er/expand-region' for the first time." (msg (car msg-and-bindings)) (bindings (cdr msg-and-bindings))) (when repeat-key - (set-temporary-overlay-map + (er/set-temporary-overlay-map (let ((map (make-sparse-keymap))) (dolist (binding bindings map) (define-key map (read-kbd-macro (car binding)) @@ -200,9 +205,10 @@ before calling `er/expand-region' for the first time." t) (or (minibufferp) (message "%s" msg))))) -(when (not (fboundp 'set-temporary-overlay-map)) +(if (fboundp 'set-temporary-overlay-map) + (fset 'er/set-temporary-overlay-map 'set-temporary-overlay-map) ;; Backport this function from newer emacs versions - (defun set-temporary-overlay-map (map &optional keep-pred) + (defun er/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: diff --git a/elpa/expand-region-20150525.205/expand-region-custom.el b/elpa/expand-region-20180817.1134/expand-region-custom.el similarity index 87% rename from elpa/expand-region-20150525.205/expand-region-custom.el rename to elpa/expand-region-20180817.1134/expand-region-custom.el index 3a55bc7c..e4a1fdd1 100644 --- a/elpa/expand-region-20150525.205/expand-region-custom.el +++ b/elpa/expand-region-20180817.1134/expand-region-custom.el @@ -92,6 +92,18 @@ always be copied to the register named after that character." :group 'expand-region :type '(repeat (symbol :tag "Major Mode" unknown))) +;;;###autoload +(defcustom 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." + :group 'expand-region + :type '(choice (const :tag "Smart behaviour" t) + (const :tag "Standard behaviour" nil))) + (provide 'expand-region-custom) ;;; expand-region-custom.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 new file mode 100644 index 00000000..baae31d6 --- /dev/null +++ b/elpa/expand-region-20180817.1134/expand-region-pkg.el @@ -0,0 +1,4 @@ +(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-20150525.205/expand-region.el b/elpa/expand-region-20180817.1134/expand-region.el similarity index 80% rename from elpa/expand-region-20150525.205/expand-region.el rename to elpa/expand-region-20180817.1134/expand-region.el index 1c2a0eb5..56efef29 100644 --- a/elpa/expand-region-20150525.205/expand-region.el +++ b/elpa/expand-region-20180817.1134/expand-region.el @@ -159,37 +159,37 @@ before calling `er/expand-region' for the first time." (not (memq last-command '(er/expand-region er/contract-region)))) (er/prepare-for-more-expansions)))) -(eval-after-load "clojure-mode" '(require 'clojure-mode-expansions)) -(eval-after-load "css-mode" '(require 'css-mode-expansions)) -(eval-after-load "erlang-mode" '(require 'erlang-mode-expansions)) -(eval-after-load "feature-mode" '(require 'feature-mode-expansions)) -(eval-after-load "sgml-mode" '(require 'html-mode-expansions)) ;; html-mode is defined in sgml-mode.el -(eval-after-load "rhtml-mode" '(require 'html-mode-expansions)) -(eval-after-load "nxhtml-mode" '(require 'html-mode-expansions)) -(eval-after-load "web-mode" '(require 'web-mode-expansions)) -(eval-after-load "js" '(require 'js-mode-expansions)) -(eval-after-load "js2-mode" '(require 'js-mode-expansions)) -(eval-after-load "js2-mode" '(require 'js2-mode-expansions)) -(eval-after-load "js3-mode" '(require 'js-mode-expansions)) -(eval-after-load "latex" '(require 'latex-mode-expansions)) -(eval-after-load "nxml-mode" '(require 'nxml-mode-expansions)) -(eval-after-load "octave-mod" '(require 'octave-expansions)) -(eval-after-load "octave" '(require 'octave-expansions)) -(eval-after-load "python" '(progn +(eval-after-load 'clojure-mode '(require 'clojure-mode-expansions)) +(eval-after-load 'css-mode '(require 'css-mode-expansions)) +(eval-after-load 'erlang-mode '(require 'erlang-mode-expansions)) +(eval-after-load 'feature-mode '(require 'feature-mode-expansions)) +(eval-after-load 'sgml-mode '(require 'html-mode-expansions)) ;; html-mode is defined in sgml-mode.el +(eval-after-load 'rhtml-mode '(require 'html-mode-expansions)) +(eval-after-load 'nxhtml-mode '(require 'html-mode-expansions)) +(eval-after-load 'web-mode '(require 'web-mode-expansions)) +(eval-after-load 'js '(require 'js-mode-expansions)) +(eval-after-load 'js2-mode '(require 'js-mode-expansions)) +(eval-after-load 'js2-mode '(require 'js2-mode-expansions)) +(eval-after-load 'js3-mode '(require 'js-mode-expansions)) +(eval-after-load 'latex '(require 'latex-mode-expansions)) +(eval-after-load 'nxml-mode '(require 'nxml-mode-expansions)) +(eval-after-load 'octave-mod '(require 'octave-expansions)) +(eval-after-load 'octave '(require 'octave-expansions)) +(eval-after-load 'python '(progn (when expand-region-guess-python-mode (expand-region-guess-python-mode)) (if (eq 'python expand-region-preferred-python-mode) (require 'python-el-expansions) (require 'python-el-fgallina-expansions)))) -(eval-after-load "python-mode" '(require 'python-mode-expansions)) -(eval-after-load "ruby-mode" '(require 'ruby-mode-expansions)) -(eval-after-load "org" '(require 'the-org-mode-expansions)) -(eval-after-load "cc-mode" '(require 'cc-mode-expansions)) -(eval-after-load "text-mode" '(require 'text-mode-expansions)) -(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 'python-mode '(require 'python-mode-expansions)) +(eval-after-load 'ruby-mode '(require 'ruby-mode-expansions)) +(eval-after-load 'org '(require 'the-org-mode-expansions)) +(eval-after-load 'cc-mode '(require 'cc-mode-expansions)) +(eval-after-load "text-mode" '(require 'text-mode-expansions)) +(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)) (provide 'expand-region) diff --git a/elpa/expand-region-20150525.205/feature-mode-expansions.el b/elpa/expand-region-20180817.1134/feature-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/feature-mode-expansions.el rename to elpa/expand-region-20180817.1134/feature-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/html-mode-expansions.el b/elpa/expand-region-20180817.1134/html-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/html-mode-expansions.el rename to elpa/expand-region-20180817.1134/html-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/js-mode-expansions.el b/elpa/expand-region-20180817.1134/js-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/js-mode-expansions.el rename to elpa/expand-region-20180817.1134/js-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/js2-mode-expansions.el b/elpa/expand-region-20180817.1134/js2-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/js2-mode-expansions.el rename to elpa/expand-region-20180817.1134/js2-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/jsp-expansions.el b/elpa/expand-region-20180817.1134/jsp-expansions.el similarity index 96% rename from elpa/expand-region-20150525.205/jsp-expansions.el rename to elpa/expand-region-20180817.1134/jsp-expansions.el index dfdf3a70..deb56fa0 100644 --- a/elpa/expand-region-20150525.205/jsp-expansions.el +++ b/elpa/expand-region-20180817.1134/jsp-expansions.el @@ -28,7 +28,7 @@ ;; These expansions aren't loaded by default, so you'll have to explicitly ;; ask for them in your init file with: ;; -;; (eval-after-load "sgml-mode" '(require 'jsp-expansions)) +;; (eval-after-load 'sgml-mode '(require 'jsp-expansions)) ;; ;; Feel free to contribute any other expansions for JSP at ;; diff --git a/elpa/expand-region-20150525.205/latex-mode-expansions.el b/elpa/expand-region-20180817.1134/latex-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/latex-mode-expansions.el rename to elpa/expand-region-20180817.1134/latex-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/nxml-mode-expansions.el b/elpa/expand-region-20180817.1134/nxml-mode-expansions.el similarity index 93% rename from elpa/expand-region-20150525.205/nxml-mode-expansions.el rename to elpa/expand-region-20180817.1134/nxml-mode-expansions.el index b997cc0d..c81b5904 100644 --- a/elpa/expand-region-20150525.205/nxml-mode-expansions.el +++ b/elpa/expand-region-20180817.1134/nxml-mode-expansions.el @@ -27,6 +27,7 @@ ;;; Code: +(require 'cl-lib) (require 'expand-region-core) (require 'html-mode-expansions) (require 'nxml-mode) @@ -74,11 +75,10 @@ point is in, or otherwise nil" (save-excursion (forward-char 1) (nxml-token-before)) - (let ((attr (find-if (lambda (att) - (and (<= (xmltok-attribute-value-start att) (point)) - (>= (xmltok-attribute-value-end att) (point)))) - xmltok-attributes))) - attr)) + (cl-find-if (lambda (att) + (and (<= (xmltok-attribute-value-start att) (point)) + (>= (xmltok-attribute-value-end att) (point)))) + xmltok-attributes)) (defun er/mark-nxml-attribute-inner-string () "Marks an attribute string" diff --git a/elpa/expand-region-20150525.205/octave-expansions.el b/elpa/expand-region-20180817.1134/octave-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/octave-expansions.el rename to elpa/expand-region-20180817.1134/octave-expansions.el diff --git a/elpa/expand-region-20150525.205/python-el-expansions.el b/elpa/expand-region-20180817.1134/python-el-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/python-el-expansions.el rename to elpa/expand-region-20180817.1134/python-el-expansions.el diff --git a/elpa/expand-region-20150525.205/python-el-fgallina-expansions.el b/elpa/expand-region-20180817.1134/python-el-fgallina-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/python-el-fgallina-expansions.el rename to elpa/expand-region-20180817.1134/python-el-fgallina-expansions.el diff --git a/elpa/expand-region-20150525.205/python-mode-expansions.el b/elpa/expand-region-20180817.1134/python-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/python-mode-expansions.el rename to elpa/expand-region-20180817.1134/python-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/ruby-mode-expansions.el b/elpa/expand-region-20180817.1134/ruby-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/ruby-mode-expansions.el rename to elpa/expand-region-20180817.1134/ruby-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/sml-mode-expansions.el b/elpa/expand-region-20180817.1134/sml-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/sml-mode-expansions.el rename to elpa/expand-region-20180817.1134/sml-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/subword-mode-expansions.el b/elpa/expand-region-20180817.1134/subword-mode-expansions.el similarity index 98% rename from elpa/expand-region-20150525.205/subword-mode-expansions.el rename to elpa/expand-region-20180817.1134/subword-mode-expansions.el index ab131fb2..8416021b 100644 --- a/elpa/expand-region-20150525.205/subword-mode-expansions.el +++ b/elpa/expand-region-20180817.1134/subword-mode-expansions.el @@ -29,6 +29,7 @@ ;;; Code: (require 'expand-region-core) +(require 'subword) (defun er/mark-subword () "Mark a subword, a part of a CamelCase identifier." diff --git a/elpa/expand-region-20150525.205/text-mode-expansions.el b/elpa/expand-region-20180817.1134/text-mode-expansions.el similarity index 100% rename from elpa/expand-region-20150525.205/text-mode-expansions.el rename to elpa/expand-region-20180817.1134/text-mode-expansions.el diff --git a/elpa/expand-region-20150525.205/the-org-mode-expansions.el b/elpa/expand-region-20180817.1134/the-org-mode-expansions.el similarity index 83% rename from elpa/expand-region-20150525.205/the-org-mode-expansions.el rename to elpa/expand-region-20180817.1134/the-org-mode-expansions.el index 4f3fcd9c..48dfce5b 100644 --- a/elpa/expand-region-20150525.205/the-org-mode-expansions.el +++ b/elpa/expand-region-20180817.1134/the-org-mode-expansions.el @@ -73,13 +73,14 @@ (defun er/add-org-mode-expansions () "Adds org-specific expansions for buffers in org-mode" - (set (make-local-variable 'er/try-expand-list) (append - er/try-expand-list - '(org-mark-subtree - er/mark-org-code-block - er/mark-sentence - er/mark-org-parent - er/mark-paragraph)))) + (set (make-local-variable 'er/try-expand-list) + (append + (remove #'er/mark-defun er/try-expand-list) + '(org-mark-subtree + er/mark-org-code-block + er/mark-sentence + er/mark-org-parent + er/mark-paragraph)))) (er/enable-mode-expansions 'org-mode 'er/add-org-mode-expansions) diff --git a/elpa/expand-region-20150525.205/web-mode-expansions.el b/elpa/expand-region-20180817.1134/web-mode-expansions.el similarity index 92% rename from elpa/expand-region-20150525.205/web-mode-expansions.el rename to elpa/expand-region-20180817.1134/web-mode-expansions.el index 6e08d3f1..44dd0945 100644 --- a/elpa/expand-region-20150525.205/web-mode-expansions.el +++ b/elpa/expand-region-20180817.1134/web-mode-expansions.el @@ -23,8 +23,7 @@ (defun er/add-web-mode-expansions () (set (make-local-variable 'er/try-expand-list) - (append er/try-expand-list - '(web-mode-mark-and-expand)))) + (cons 'web-mode-mark-and-expand er/try-expand-list))) (add-hook 'web-mode-hook 'er/add-web-mode-expansions) -- 2.47.3