From 830283d8692a692f22819c0d1d153453199dad17 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 14 Jul 2015 22:34:53 +0200 Subject: [PATCH] new version of expand-region. --- bba.org | 2 +- .../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 | 18 +++++--------- .../expand-region-core.el | 24 ++++++++++++------- .../expand-region-custom.el | 0 .../expand-region-pkg.el | 4 ++++ .../expand-region.el | 0 .../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 | 0 .../text-mode-expansions.el | 0 .../the-org-mode-expansions.el | 0 .../web-mode-expansions.el | 0 31 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 elpa/expand-region-20141223.1328/expand-region-pkg.el rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/cc-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/clojure-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/cperl-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/css-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/enh-ruby-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/er-basic-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/erlang-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/expand-region-autoloads.el (84%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/expand-region-core.el (94%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/expand-region-custom.el (100%) create mode 100644 elpa/expand-region-20150525.205/expand-region-pkg.el rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/expand-region.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/feature-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/html-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/js-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/js2-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/jsp-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/latex-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/nxml-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/octave-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/python-el-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/python-el-fgallina-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/python-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/ruby-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/sml-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/subword-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/text-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/the-org-mode-expansions.el (100%) rename elpa/{expand-region-20141223.1328 => expand-region-20150525.205}/web-mode-expansions.el (100%) diff --git a/bba.org b/bba.org index b43550e7..3485937d 100644 --- a/bba.org +++ b/bba.org @@ -229,7 +229,7 @@ search the web on your fingertips. C-c /. #+BEGIN_SRC emacs-lisp (if (>= emacs-major-version 24) (progn - (add-to-list 'load-path "~/.emacs.d/elpa/expand-region-20141223.1328") + (add-to-list 'load-path "~/.emacs.d/elpa/expand-region-20150525.205") (require 'expand-region) (define-key global-map (kbd "C-c ") 'er/contract-region ) (define-key global-map (kbd "C-c ") 'er/expand-region ) diff --git a/elpa/expand-region-20141223.1328/expand-region-pkg.el b/elpa/expand-region-20141223.1328/expand-region-pkg.el deleted file mode 100644 index 710e0c85..00000000 --- a/elpa/expand-region-20141223.1328/expand-region-pkg.el +++ /dev/null @@ -1,4 +0,0 @@ -(define-package "expand-region" "20141223.1328" "Increase selected region by semantic units." 'nil) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/expand-region-20141223.1328/cc-mode-expansions.el b/elpa/expand-region-20150525.205/cc-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/cc-mode-expansions.el rename to elpa/expand-region-20150525.205/cc-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/clojure-mode-expansions.el b/elpa/expand-region-20150525.205/clojure-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/clojure-mode-expansions.el rename to elpa/expand-region-20150525.205/clojure-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/cperl-mode-expansions.el b/elpa/expand-region-20150525.205/cperl-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/cperl-mode-expansions.el rename to elpa/expand-region-20150525.205/cperl-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/css-mode-expansions.el b/elpa/expand-region-20150525.205/css-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/css-mode-expansions.el rename to elpa/expand-region-20150525.205/css-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/enh-ruby-mode-expansions.el b/elpa/expand-region-20150525.205/enh-ruby-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/enh-ruby-mode-expansions.el rename to elpa/expand-region-20150525.205/enh-ruby-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/er-basic-expansions.el b/elpa/expand-region-20150525.205/er-basic-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/er-basic-expansions.el rename to elpa/expand-region-20150525.205/er-basic-expansions.el diff --git a/elpa/expand-region-20141223.1328/erlang-mode-expansions.el b/elpa/expand-region-20150525.205/erlang-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/erlang-mode-expansions.el rename to elpa/expand-region-20150525.205/erlang-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/expand-region-autoloads.el b/elpa/expand-region-20150525.205/expand-region-autoloads.el similarity index 84% rename from elpa/expand-region-20141223.1328/expand-region-autoloads.el rename to elpa/expand-region-20150525.205/expand-region-autoloads.el index 31bc2035..73e8ed05 100644 --- a/elpa/expand-region-20141223.1328/expand-region-autoloads.el +++ b/elpa/expand-region-20150525.205/expand-region-autoloads.el @@ -1,10 +1,10 @@ ;;; expand-region-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - +(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads (er/expand-region) "expand-region" "expand-region.el" -;;;;;; (21788 64883 0 0)) +;;;### (autoloads nil "expand-region" "expand-region.el" (21908 14274 +;;;;;; 0 0)) ;;; Generated autoloads from expand-region.el (autoload 'er/expand-region "expand-region" "\ @@ -19,12 +19,8 @@ before calling `er/expand-region' for the first time. ;;;*** -;;;### (autoloads (expand-region-exclude-text-mode-expansions expand-region-reset-fast-key -;;;;;; expand-region-contract-fast-key expand-region-fast-keys-enabled -;;;;;; expand-region-skip-whitespace expand-region-autocopy-register -;;;;;; expand-region-guess-python-mode expand-region-preferred-python-mode -;;;;;; expand-region) "expand-region-custom" "expand-region-custom.el" -;;;;;; (21788 64883 0 0)) +;;;### (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)))) @@ -82,15 +78,13 @@ List of modes which derive from `text-mode' for which text mode expansions are n ;;;;;; "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") (21788 64883 251620 0)) +;;;;;; "web-mode-expansions.el") (21908 14275 654619 0)) ;;;*** -(provide 'expand-region-autoloads) ;; 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-20141223.1328/expand-region-core.el b/elpa/expand-region-20150525.205/expand-region-core.el similarity index 94% rename from elpa/expand-region-20141223.1328/expand-region-core.el rename to elpa/expand-region-20150525.205/expand-region-core.el index ccab2908..5f3c4d9d 100644 --- a/elpa/expand-region-20141223.1328/expand-region-core.el +++ b/elpa/expand-region-20150525.205/expand-region-core.el @@ -59,6 +59,12 @@ (set-register (aref expand-region-autocopy-register 0) (filter-buffer-substring (region-beginning) (region-end))))) +;; save-mark-and-excursion in Emacs 25 works like save-excursion did before +(eval-when-compile + (when (not (fboundp 'save-mark-and-excursion)) + (defmacro save-mark-and-excursion (&rest body) + `(save-excursion ,@body)))) + (defun er--expand-region-1 () "Increase selected region by semantic units. Basically it runs all the mark-functions in `er/try-expand-list' @@ -90,15 +96,15 @@ moving point or mark as little as possible." (setq start (point))) (while try-list - (save-excursion - (ignore-errors - (funcall (car try-list)) - (when (and (region-active-p) - (er--this-expansion-is-better start end best-start best-end)) - (setq best-start (point)) - (setq best-end (mark)) - (when (and er--show-expansion-message (not (minibufferp))) - (message "%S" (car try-list)))))) + (save-mark-and-excursion + (ignore-errors + (funcall (car try-list)) + (when (and (region-active-p) + (er--this-expansion-is-better start end best-start best-end)) + (setq best-start (point)) + (setq best-end (mark)) + (when (and er--show-expansion-message (not (minibufferp))) + (message "%S" (car try-list)))))) (setq try-list (cdr try-list))) (setq deactivate-mark nil) diff --git a/elpa/expand-region-20141223.1328/expand-region-custom.el b/elpa/expand-region-20150525.205/expand-region-custom.el similarity index 100% rename from elpa/expand-region-20141223.1328/expand-region-custom.el rename to elpa/expand-region-20150525.205/expand-region-custom.el diff --git a/elpa/expand-region-20150525.205/expand-region-pkg.el b/elpa/expand-region-20150525.205/expand-region-pkg.el new file mode 100644 index 00000000..6cd63434 --- /dev/null +++ b/elpa/expand-region-20150525.205/expand-region-pkg.el @@ -0,0 +1,4 @@ +(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-20141223.1328/expand-region.el b/elpa/expand-region-20150525.205/expand-region.el similarity index 100% rename from elpa/expand-region-20141223.1328/expand-region.el rename to elpa/expand-region-20150525.205/expand-region.el diff --git a/elpa/expand-region-20141223.1328/feature-mode-expansions.el b/elpa/expand-region-20150525.205/feature-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/feature-mode-expansions.el rename to elpa/expand-region-20150525.205/feature-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/html-mode-expansions.el b/elpa/expand-region-20150525.205/html-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/html-mode-expansions.el rename to elpa/expand-region-20150525.205/html-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/js-mode-expansions.el b/elpa/expand-region-20150525.205/js-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/js-mode-expansions.el rename to elpa/expand-region-20150525.205/js-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/js2-mode-expansions.el b/elpa/expand-region-20150525.205/js2-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/js2-mode-expansions.el rename to elpa/expand-region-20150525.205/js2-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/jsp-expansions.el b/elpa/expand-region-20150525.205/jsp-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/jsp-expansions.el rename to elpa/expand-region-20150525.205/jsp-expansions.el diff --git a/elpa/expand-region-20141223.1328/latex-mode-expansions.el b/elpa/expand-region-20150525.205/latex-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/latex-mode-expansions.el rename to elpa/expand-region-20150525.205/latex-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/nxml-mode-expansions.el b/elpa/expand-region-20150525.205/nxml-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/nxml-mode-expansions.el rename to elpa/expand-region-20150525.205/nxml-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/octave-expansions.el b/elpa/expand-region-20150525.205/octave-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/octave-expansions.el rename to elpa/expand-region-20150525.205/octave-expansions.el diff --git a/elpa/expand-region-20141223.1328/python-el-expansions.el b/elpa/expand-region-20150525.205/python-el-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/python-el-expansions.el rename to elpa/expand-region-20150525.205/python-el-expansions.el diff --git a/elpa/expand-region-20141223.1328/python-el-fgallina-expansions.el b/elpa/expand-region-20150525.205/python-el-fgallina-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/python-el-fgallina-expansions.el rename to elpa/expand-region-20150525.205/python-el-fgallina-expansions.el diff --git a/elpa/expand-region-20141223.1328/python-mode-expansions.el b/elpa/expand-region-20150525.205/python-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/python-mode-expansions.el rename to elpa/expand-region-20150525.205/python-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/ruby-mode-expansions.el b/elpa/expand-region-20150525.205/ruby-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/ruby-mode-expansions.el rename to elpa/expand-region-20150525.205/ruby-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/sml-mode-expansions.el b/elpa/expand-region-20150525.205/sml-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/sml-mode-expansions.el rename to elpa/expand-region-20150525.205/sml-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/subword-mode-expansions.el b/elpa/expand-region-20150525.205/subword-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/subword-mode-expansions.el rename to elpa/expand-region-20150525.205/subword-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/text-mode-expansions.el b/elpa/expand-region-20150525.205/text-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/text-mode-expansions.el rename to elpa/expand-region-20150525.205/text-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/the-org-mode-expansions.el b/elpa/expand-region-20150525.205/the-org-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/the-org-mode-expansions.el rename to elpa/expand-region-20150525.205/the-org-mode-expansions.el diff --git a/elpa/expand-region-20141223.1328/web-mode-expansions.el b/elpa/expand-region-20150525.205/web-mode-expansions.el similarity index 100% rename from elpa/expand-region-20141223.1328/web-mode-expansions.el rename to elpa/expand-region-20150525.205/web-mode-expansions.el -- 2.47.3