From 57317b942b3606d1737da6a7ac1181cdccf52b69 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 22 Dec 2024 12:57:27 +0100 Subject: [PATCH] update expand-region Signed-off-by: Andreas Gerler --- .../expand-region-pkg.el | 9 -- .../cc-mode-expansions.el | 20 +-- .../clojure-mode-expansions.el | 8 +- .../cperl-mode-expansions.el | 6 +- .../css-mode-expansions.el | 6 +- .../enh-ruby-mode-expansions.el | 8 +- .../er-basic-expansions.el | 31 +++- .../erlang-mode-expansions.el | 6 +- .../expand-region-autoloads.el | 151 +++--------------- .../expand-region-core.el | 52 +++--- .../expand-region-custom.el | 36 ++--- .../expand-region-pkg.el | 10 ++ .../expand-region.el | 13 +- .../feature-mode-expansions.el | 6 +- .../html-mode-expansions.el | 17 +- .../js-mode-expansions.el | 17 +- .../js2-mode-expansions.el | 6 +- .../jsp-expansions.el | 6 +- .../latex-mode-expansions.el | 6 +- .../nxml-mode-expansions.el | 6 +- .../octave-expansions.el | 6 +- .../python-el-expansions.el | 6 +- .../python-el-fgallina-expansions.el | 12 +- .../python-mode-expansions.el | 8 +- .../ruby-mode-expansions.el | 38 ++--- .../sml-mode-expansions.el | 6 +- .../subword-mode-expansions.el | 4 +- .../text-mode-expansions.el | 6 +- .../the-org-mode-expansions.el | 7 +- .../web-mode-expansions.el | 6 +- .../yaml-mode-expansions.el | 28 ++-- elpa/expand-region-readme.txt | 112 ------------- 32 files changed, 238 insertions(+), 421 deletions(-) delete mode 100644 elpa/expand-region-20221030.957/expand-region-pkg.el rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/cc-mode-expansions.el (91%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/clojure-mode-expansions.el (93%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/cperl-mode-expansions.el (92%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/css-mode-expansions.el (91%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/enh-ruby-mode-expansions.el (88%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/er-basic-expansions.el (85%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/erlang-mode-expansions.el (89%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/expand-region-autoloads.el (65%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/expand-region-core.el (90%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/expand-region-custom.el (80%) create mode 100644 elpa/expand-region-20241217.1840/expand-region-pkg.el rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/expand-region.el (95%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/feature-mode-expansions.el (93%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/html-mode-expansions.el (85%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/js-mode-expansions.el (91%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/js2-mode-expansions.el (92%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/jsp-expansions.el (92%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/latex-mode-expansions.el (95%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/nxml-mode-expansions.el (95%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/octave-expansions.el (94%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/python-el-expansions.el (94%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/python-el-fgallina-expansions.el (94%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/python-mode-expansions.el (95%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/ruby-mode-expansions.el (87%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/sml-mode-expansions.el (91%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/subword-mode-expansions.el (93%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/text-mode-expansions.el (92%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/the-org-mode-expansions.el (94%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/web-mode-expansions.el (84%) rename elpa/{expand-region-20221030.957 => expand-region-20241217.1840}/yaml-mode-expansions.el (88%) delete mode 100644 elpa/expand-region-readme.txt diff --git a/elpa/expand-region-20221030.957/expand-region-pkg.el b/elpa/expand-region-20221030.957/expand-region-pkg.el deleted file mode 100644 index dc95cbe1..00000000 --- a/elpa/expand-region-20221030.957/expand-region-pkg.el +++ /dev/null @@ -1,9 +0,0 @@ -(define-package "expand-region" "20221030.957" "Increase selected region by semantic units." 'nil :commit "b70feaa644310dc2d599dc277cd20a1f2b6446ac" :authors - '(("Magnar Sveen" . "magnars@gmail.com")) - :maintainer - '("Magnar Sveen" . "magnars@gmail.com") - :keywords - '("marking" "region")) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/expand-region-20221030.957/cc-mode-expansions.el b/elpa/expand-region-20241217.1840/cc-mode-expansions.el similarity index 91% rename from elpa/expand-region-20221030.957/cc-mode-expansions.el rename to elpa/expand-region-20241217.1840/cc-mode-expansions.el index 9effbecc..126b7f19 100644 --- a/elpa/expand-region-20221030.957/cc-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/cc-mode-expansions.el @@ -1,6 +1,6 @@ -;;; cc-mode-expansions.el --- C-specific expansions for expand-region +;;; cc-mode-expansions.el --- C-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 François Févotte +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: François Févotte ;; Based on js-mode-expansions by: Magnar Sveen @@ -119,7 +119,7 @@ This function captures identifiers composed of multiple doc "\n\n" "This function tries to mark a region consisting of two parts:\n" (format " - the first part is marked using `%s'\n" (symbol-name mark-first-part)) - (format " - the second part is a block beginning with '%s'\n\n" open-brace))) + (format " - the second part is a block beginning with %S\n\n" open-brace))) `(progn (defun ,(intern (concat (symbol-name name) "-1")) () ,(concat docstring @@ -173,13 +173,13 @@ This function captures identifiers composed of multiple er/c-mark-statement-block-1 er/c-mark-statement-block-2 er/c-mark-vector-access-1 er/c-mark-vector-access-2)))) -(er/enable-mode-expansions 'c-mode 'er/add-cc-mode-expansions) -(er/enable-mode-expansions 'c++-mode 'er/add-cc-mode-expansions) -(er/enable-mode-expansions 'objc-mode 'er/add-cc-mode-expansions) -(er/enable-mode-expansions 'java-mode 'er/add-cc-mode-expansions) -(er/enable-mode-expansions 'idl-mode 'er/add-cc-mode-expansions) -(er/enable-mode-expansions 'pike-mode 'er/add-cc-mode-expansions) -(er/enable-mode-expansions 'awk-mode 'er/add-cc-mode-expansions) +(er/enable-mode-expansions 'c-mode #'er/add-cc-mode-expansions) +(er/enable-mode-expansions 'c++-mode #'er/add-cc-mode-expansions) +(er/enable-mode-expansions 'objc-mode #'er/add-cc-mode-expansions) +(er/enable-mode-expansions 'java-mode #'er/add-cc-mode-expansions) +(er/enable-mode-expansions 'idl-mode #'er/add-cc-mode-expansions) +(er/enable-mode-expansions 'pike-mode #'er/add-cc-mode-expansions) +(er/enable-mode-expansions 'awk-mode #'er/add-cc-mode-expansions) (provide 'cc-mode-expansions) diff --git a/elpa/expand-region-20221030.957/clojure-mode-expansions.el b/elpa/expand-region-20241217.1840/clojure-mode-expansions.el similarity index 93% rename from elpa/expand-region-20221030.957/clojure-mode-expansions.el rename to elpa/expand-region-20241217.1840/clojure-mode-expansions.el index 4598039b..17c75d20 100644 --- a/elpa/expand-region-20221030.957/clojure-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/clojure-mode-expansions.el @@ -1,6 +1,6 @@ -;;; clojure-mode-expansions.el --- Clojure-specific expansions for expand-region +;;; clojure-mode-expansions.el --- Clojure-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2011 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -98,8 +98,8 @@ If point is inside the parens, they will be marked first anyway." er/mark-clj-set-literal er/mark-clj-function-literal)))) -(er/enable-mode-expansions 'clojure-mode 'er/add-clojure-mode-expansions) -(er/enable-mode-expansions 'nrepl-mode 'er/add-clojure-mode-expansions) +(er/enable-mode-expansions 'clojure-mode #'er/add-clojure-mode-expansions) +(er/enable-mode-expansions 'nrepl-mode #'er/add-clojure-mode-expansions) (provide 'clojure-mode-expansions) diff --git a/elpa/expand-region-20221030.957/cperl-mode-expansions.el b/elpa/expand-region-20241217.1840/cperl-mode-expansions.el similarity index 92% rename from elpa/expand-region-20221030.957/cperl-mode-expansions.el rename to elpa/expand-region-20241217.1840/cperl-mode-expansions.el index 1fe24ea8..b9e4e2e4 100644 --- a/elpa/expand-region-20221030.957/cperl-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/cperl-mode-expansions.el @@ -1,6 +1,6 @@ -;;; cperl-mode-expansions.el --- perl-specific expansions for expand-region +;;; cperl-mode-expansions.el --- perl-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Kang-min Liu +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Kang-min Liu ;; Keywords: marking region cperl @@ -60,7 +60,7 @@ er/mark-cperl-subroutine )))) -(er/enable-mode-expansions 'cperl-mode 'er/add-cperl-mode-expansions) +(er/enable-mode-expansions 'cperl-mode #'er/add-cperl-mode-expansions) (provide 'cperl-mode-expansions) diff --git a/elpa/expand-region-20221030.957/css-mode-expansions.el b/elpa/expand-region-20241217.1840/css-mode-expansions.el similarity index 91% rename from elpa/expand-region-20221030.957/css-mode-expansions.el rename to elpa/expand-region-20241217.1840/css-mode-expansions.el index 8f826a21..3ab14cb3 100644 --- a/elpa/expand-region-20221030.957/css-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/css-mode-expansions.el @@ -1,6 +1,6 @@ -;;; css-mode-expansions.el --- CSS-specific expansions for expand-region +;;; css-mode-expansions.el --- CSS-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2011 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -45,7 +45,7 @@ er/try-expand-list '(er/mark-css-declaration)))) -(er/enable-mode-expansions 'css-mode 'er/add-css-mode-expansions) +(er/enable-mode-expansions 'css-mode #'er/add-css-mode-expansions) (provide 'css-mode-expansions) diff --git a/elpa/expand-region-20221030.957/enh-ruby-mode-expansions.el b/elpa/expand-region-20241217.1840/enh-ruby-mode-expansions.el similarity index 88% rename from elpa/expand-region-20221030.957/enh-ruby-mode-expansions.el rename to elpa/expand-region-20241217.1840/enh-ruby-mode-expansions.el index 145beb2d..4e26802d 100644 --- a/elpa/expand-region-20221030.957/enh-ruby-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/enh-ruby-mode-expansions.el @@ -1,6 +1,6 @@ -;;; enh-ruby-mode-expansions.el --- Expansions for enh-ruby-mode +;;; enh-ruby-mode-expansions.el --- Expansions for enh-ruby-mode -*- lexical-binding: t; -*- -;; Copyright (C) 2011 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -28,6 +28,8 @@ ;;; Code: +(require 'expand-region-core) + (defun er/add-enh-ruby-mode-expansions () "Adds Ruby-specific expansions for buffers in enh-ruby-mode" (require 'ruby-mode-expansions) @@ -37,6 +39,6 @@ '(er/mark-ruby-instance-variable er/mark-ruby-block-up)))) -(er/enable-mode-expansions 'enh-ruby-mode 'er/add-enh-ruby-mode-expansions) +(er/enable-mode-expansions 'enh-ruby-mode #'er/add-enh-ruby-mode-expansions) (provide 'enh-ruby-mode-expansions) diff --git a/elpa/expand-region-20221030.957/er-basic-expansions.el b/elpa/expand-region-20241217.1840/er-basic-expansions.el similarity index 85% rename from elpa/expand-region-20221030.957/er-basic-expansions.el rename to elpa/expand-region-20241217.1840/er-basic-expansions.el index 3c4ef6ba..08cdc562 100644 --- a/elpa/expand-region-20221030.957/er-basic-expansions.el +++ b/elpa/expand-region-20241217.1840/er-basic-expansions.el @@ -1,6 +1,6 @@ -;;; er-basic-expansions.el --- Words, symbols, strings, et al +;;; er-basic-expansions.el --- Words, symbols, strings, et al -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2013 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -69,11 +69,11 @@ period and marks next symbol." (when (use-region-p) (when (< (point) (mark)) (exchange-point-and-mark)) - (let ((symbol-regexp "\\s_\\|\\sw")) + ;; (let ((symbol-regexp "\\s_\\|\\sw")) (when (looking-at "\\.") (forward-char 1) (skip-syntax-forward "_w") - (exchange-point-and-mark))))) + (exchange-point-and-mark)))) ;; ) (defun er/mark-method-call () "Mark the current symbol (including dots) and then paren to closing paren." @@ -116,7 +116,7 @@ period and marks next symbol." "The char that is the current quote delimiter" (nth 3 (syntax-ppss))) -(defalias 'er--point-inside-string-p 'er--current-quotes-char) +(defalias 'er--point-inside-string-p #'er--current-quotes-char) (defun er--move-point-forward-out-of-string () "Move point forward until it exits the current quoted string." @@ -242,5 +242,26 @@ period and marks next symbol." er/mark-defun) er/try-expand-list)) +(when (and (>= emacs-major-version 29) + (treesit-available-p)) + (defun er/mark-ts-node () + "Mark tree sitter node around or after point." + (interactive) + (when (treesit-language-at (point)) + (let* ((node (if (use-region-p) + (treesit-node-on (region-beginning) (region-end)) + (treesit-node-at (point)))) + (node-start (treesit-node-start node)) + (node-end (treesit-node-end node))) + ;; when the node fits the region exactly, try its parent node instead + (when (and (= (region-beginning) node-start) + (= (region-end) node-end)) + (when-let ((node (treesit-node-parent node))) + (setq node-start (treesit-node-start node) + node-end (treesit-node-end node)))) + (goto-char node-start) + (set-mark node-end)))) + (setq er/try-expand-list (append er/try-expand-list '(er/mark-ts-node)))) + (provide 'er-basic-expansions) ;;; er-basic-expansions.el ends here diff --git a/elpa/expand-region-20221030.957/erlang-mode-expansions.el b/elpa/expand-region-20241217.1840/erlang-mode-expansions.el similarity index 89% rename from elpa/expand-region-20221030.957/erlang-mode-expansions.el rename to elpa/expand-region-20241217.1840/erlang-mode-expansions.el index 14bfce4e..9970c5d3 100644 --- a/elpa/expand-region-20221030.957/erlang-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/erlang-mode-expansions.el @@ -1,6 +1,6 @@ -;;; erlang-mode-expansions.el --- Erlang-specific expansions for expand-region +;;; erlang-mode-expansions.el --- Erlang-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Gleb Peregud +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Gleb Peregud ;; Based on python-mode-expansions by: Ivan Andrus @@ -40,7 +40,7 @@ '(erlang-mark-function erlang-mark-clause)))) -(er/enable-mode-expansions 'erlang-mode 'er/add-erlang-mode-expansions) +(er/enable-mode-expansions 'erlang-mode #'er/add-erlang-mode-expansions) (provide 'erlang-mode-expansions) diff --git a/elpa/expand-region-20221030.957/expand-region-autoloads.el b/elpa/expand-region-20241217.1840/expand-region-autoloads.el similarity index 65% rename from elpa/expand-region-20221030.957/expand-region-autoloads.el rename to elpa/expand-region-20241217.1840/expand-region-autoloads.el index ed2e15a0..a8c1e617 100644 --- a/elpa/expand-region-20221030.957/expand-region-autoloads.el +++ b/elpa/expand-region-20241217.1840/expand-region-autoloads.el @@ -1,68 +1,49 @@ -;;; expand-region-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; expand-region-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "cc-mode-expansions" "cc-mode-expansions.el" -;;;;;; (0 0 0 0)) ;;; Generated autoloads from cc-mode-expansions.el (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 (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 (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 (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 (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 (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 (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" "\ @@ -73,12 +54,9 @@ 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) +(fn ARG)" t) -;;;*** -;;;### (autoloads nil "expand-region-core" "expand-region-core.el" -;;;;;; (0 0 0 0)) ;;; Generated autoloads from expand-region-core.el (autoload 'er/contract-region "expand-region-core" "\ @@ -88,60 +66,39 @@ If prefix argument is negative calls `er/expand-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) - +(fn ARG)" t) (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)))) - +(let ((loads (get 'expand-region 'custom-loads))) (if (member '"expand-region-custom" loads) nil (put 'expand-region 'custom-loads (cons '"expand-region-custom" loads)) (put 'tools 'custom-loads (cons 'expand-region (get 'tools 'custom-loads))))) (defvar expand-region-preferred-python-mode 'python "\ -The name of your preferred python mode") - +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") - +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.") +Register to copy most recent expand or contract to. +Activated when set to a string of a single character (for example, \"e\").") (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") - +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") - +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.") - +List of modes derived from `text-mode' to exclude from text mode expansions.") (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. @@ -149,172 +106,114 @@ 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") - +(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) - (register-definition-prefixes "expand-region-custom" '("expand-region-")) -;;;*** -;;;### (autoloads nil "feature-mode-expansions" "feature-mode-expansions.el" -;;;;;; (0 0 0 0)) ;;; Generated autoloads from feature-mode-expansions.el (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 (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 (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 (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 (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 (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 (register-definition-prefixes "nxml-mode-expansions" '("er/")) -;;;*** -;;;### (autoloads nil "octave-expansions" "octave-expansions.el" -;;;;;; (0 0 0 0)) ;;; Generated autoloads from octave-expansions.el (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 (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 (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 (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 (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 (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 (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 (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 (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 (register-definition-prefixes "web-mode-expansions" '("er/add-web-mode-expansions")) -;;;*** -;;;### (autoloads nil "yaml-mode-expansions" "yaml-mode-expansions.el" -;;;;;; (0 0 0 0)) ;;; Generated autoloads from yaml-mode-expansions.el (register-definition-prefixes "yaml-mode-expansions" '("er--" "er/" "yaml-indent")) - -;;;*** -;;;### (autoloads nil nil ("expand-region-pkg.el") (0 0 0 0)) +;;; End of scraped data + +(provide 'expand-region-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; expand-region-autoloads.el ends here diff --git a/elpa/expand-region-20221030.957/expand-region-core.el b/elpa/expand-region-20241217.1840/expand-region-core.el similarity index 90% rename from elpa/expand-region-20221030.957/expand-region-core.el rename to elpa/expand-region-20241217.1840/expand-region-core.el index d9d472de..c239fd1f 100644 --- a/elpa/expand-region-20221030.957/expand-region-core.el +++ b/elpa/expand-region-20241217.1840/expand-region-core.el @@ -1,6 +1,6 @@ -;;; expand-region-core.el --- Increase selected region by semantic units. +;;; expand-region-core.el --- Increase selected region by semantic units. -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2013 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -26,7 +26,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) (require 'expand-region-custom) (declare-function er/expand-region "expand-region") @@ -39,7 +38,7 @@ (defvar er--space-str " \t\n") (defvar er--blank-list (append er--space-str nil)) -(set-default 'er--show-expansion-message nil) +(defvar er--show-expansion-message nil) (defvar er/try-expand-list nil "A list of functions that are tried when expanding.") @@ -47,6 +46,10 @@ (defvar er/save-mode-excursion nil "A function to save excursion state when expanding.") +(defsubst er--first-invocation () + "t if this is the first invocation of `er/expand-region' or `er/contract-region'." + (not (memq last-command '(er/expand-region er/contract-region)))) + (defun er--prepare-expanding () (when (and (er--first-invocation) (not (use-region-p))) @@ -87,11 +90,12 @@ moving point or mark as little as possible." (try-list er/try-expand-list) (best-start (point-min)) (best-end (point-max)) - (set-mark-default-inactive nil)) + ;; (set-mark-default-inactive nil) + ) ;; add hook to clear history on buffer changes (unless er/history - (add-hook 'after-change-functions 'er/clear-history t t)) + (add-hook 'after-change-functions #'er/clear-history t t)) ;; remember the start and end points so we can contract later ;; unless we're already at maximum size @@ -216,10 +220,11 @@ before calling `er/expand-region' for the first time." t) (or (not expand-region-show-usage-message) (minibufferp) (message "%s" msg))))) -(if (fboundp 'set-temporary-overlay-map) - (fset 'er/set-temporary-overlay-map 'set-temporary-overlay-map) - ;; Backport this function from newer emacs versions - (defun er/set-temporary-overlay-map (map &optional keep-pred) +(defalias 'er/set-temporary-overlay-map + (if (fboundp 'set-temporary-overlay-map) ;Emacs≥24.3 + #'set-temporary-overlay-map + ;; Backport this function from newer emacs versions + (lambda (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: @@ -253,29 +258,28 @@ remove the keymap depends on user input and KEEP-PRED: (fset clearfunsym clearfun) (add-hook 'pre-command-hook clearfunsym) - (push alist emulation-mode-map-alists)))) + (push alist emulation-mode-map-alists))))) -(defadvice keyboard-quit (before collapse-region activate) +(advice-add 'keyboard-quit :before #'er--collapse-region-before) +(advice-add 'cua-cancel :before #'er--collapse-region-before) +(defun er--collapse-region-before (&rest _) + ;; FIXME: Re-use `er--first-invocation'? (when (memq last-command '(er/expand-region er/contract-region)) (er/contract-region 0))) -(defadvice minibuffer-keyboard-quit (around collapse-region activate) +(advice-add 'minibuffer-keyboard-quit + :around #'er--collapse-region-minibuffer-keyboard-quit) +(defun er--collapse-region-minibuffer-keyboard-quit (orig-fun &rest args) + ;; FIXME: Re-use `er--first-invocation'? (if (memq last-command '(er/expand-region er/contract-region)) (er/contract-region 0) - ad-do-it)) + (apply orig-fun args))) -(defadvice cua-cancel (before collapse-region activate) - (when (memq last-command '(er/expand-region er/contract-region)) - (er/contract-region 0))) -(defun er/clear-history (&rest args) +(defun er/clear-history (&rest _) "Clear the history." (setq er/history '()) - (remove-hook 'after-change-functions 'er/clear-history t)) - -(defsubst er--first-invocation () - "t if this is the first invocation of er/expand-region or er/contract-region" - (not (memq last-command '(er/expand-region er/contract-region)))) + (remove-hook 'after-change-functions #'er/clear-history t)) (defun er--point-is-surrounded-by-white-space () (and (or (memq (char-before) er--blank-list) @@ -284,7 +288,7 @@ remove the keymap depends on user input and KEEP-PRED: (defun er/enable-mode-expansions (mode add-fn) (add-hook (intern (format "%s-hook" mode)) add-fn) - (save-window-excursion + (save-window-excursion ;; FIXME: Why? (dolist (buffer (buffer-list)) (with-current-buffer buffer (when (derived-mode-p mode) diff --git a/elpa/expand-region-20221030.957/expand-region-custom.el b/elpa/expand-region-20241217.1840/expand-region-custom.el similarity index 80% rename from elpa/expand-region-20221030.957/expand-region-custom.el rename to elpa/expand-region-20241217.1840/expand-region-custom.el index a6a5d156..f86f861a 100644 --- a/elpa/expand-region-20221030.957/expand-region-custom.el +++ b/elpa/expand-region-20241217.1840/expand-region-custom.el @@ -1,6 +1,6 @@ -;;; expand-region-custom.el --- Increase selected region by semantic units. +;;; expand-region-custom.el --- Increase selected region by semantic units. -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Magnar Sveen +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -31,16 +31,14 @@ ;;;###autoload (defcustom expand-region-preferred-python-mode 'python - "The name of your preferred python mode" - :group 'expand-region - :type '(choice (const :tag "Emacs' python.el" 'python) - (const :tag "fgallina's python.el" 'fgallina-python) - (const :tag "python-mode.el" 'python-mode))) + "The name of your preferred python mode." + :type '(choice (const :tag "Emacs' python.el" python) + (const :tag "fgallina's python.el" fgallina-python) + (const :tag "python-mode.el" python-mode))) ;;;###autoload (defcustom expand-region-guess-python-mode t - "If expand-region should attempt to guess your preferred python mode" - :group 'expand-region + "If expand-region should attempt to guess your preferred python mode." :type '(choice (const :tag "Guess" t) (const :tag "Do not guess" nil))) @@ -53,43 +51,37 @@ ;;;###autoload (defcustom 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." - :group 'expand-region + "Register to copy most recent expand or contract to. + +Activated when set to a string of a single character (for example, \"e\")." :type 'string) ;;;###autoload (defcustom expand-region-skip-whitespace t - "If expand-region should skip past whitespace on initial expansion" - :group 'expand-region + "If expand-region should skip past whitespace on initial expansion." :type '(choice (const :tag "Skip whitespace" t) (const :tag "Do not skip whitespace" nil))) ;;;###autoload (defcustom expand-region-fast-keys-enabled t - "If expand-region should bind fast keys after initial expand/contract" - :group 'expand-region + "If expand-region should bind fast keys after initial expand/contract." :type '(choice (const :tag "Enable fast keys" t) (const :tag "Disable fast keys" nil))) ;;;###autoload (defcustom expand-region-contract-fast-key "-" "Key to use after an initial expand/contract to contract once more." - :group 'expand-region :type 'string) ;;;###autoload (defcustom expand-region-reset-fast-key "0" "Key to use after an initial expand/contract to undo." - :group 'expand-region :type 'string) ;;;###autoload (defcustom 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." - :group 'expand-region + "List of modes derived from `text-mode' to exclude from text mode expansions." :type '(repeat (symbol :tag "Major Mode" unknown))) ;;;###autoload @@ -100,7 +92,6 @@ 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))) @@ -111,7 +102,6 @@ If set to nil, always place the cursor at the beginning of the region." ;;;###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))) diff --git a/elpa/expand-region-20241217.1840/expand-region-pkg.el b/elpa/expand-region-20241217.1840/expand-region-pkg.el new file mode 100644 index 00000000..bc5f7800 --- /dev/null +++ b/elpa/expand-region-20241217.1840/expand-region-pkg.el @@ -0,0 +1,10 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "expand-region" "20241217.1840" + "Increase selected region by semantic units." + '((emacs "24.4")) + :url "https://github.com/magnars/expand-region.el" + :commit "351279272330cae6cecea941b0033a8dd8bcc4e8" + :revdesc "351279272330" + :keywords '("marking" "region") + :authors '(("Magnar Sveen" . "magnars@gmail.com")) + :maintainers '(("Magnar Sveen" . "magnars@gmail.com"))) diff --git a/elpa/expand-region-20221030.957/expand-region.el b/elpa/expand-region-20241217.1840/expand-region.el similarity index 95% rename from elpa/expand-region-20221030.957/expand-region.el rename to elpa/expand-region-20241217.1840/expand-region.el index b4e3b341..74d2c27d 100644 --- a/elpa/expand-region-20221030.957/expand-region.el +++ b/elpa/expand-region-20241217.1840/expand-region.el @@ -1,9 +1,13 @@ -;;; expand-region.el --- Increase selected region by semantic units. +;;; expand-region.el --- Increase selected region by semantic units. -*- lexical-binding: t; -*- -;; Copyright (C) 2011 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region +;; URL: https://github.com/magnars/expand-region.el +;; Package-Version: 20241217.1840 +;; Package-Revision: 351279272330 +;; Package-Requires: ((emacs "24.4")) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -80,13 +84,12 @@ ;; `mark-page`. To add it to the try-list, do this: ;; (defun er/add-text-mode-expansions () -;; (make-variable-buffer-local 'er/try-expand-list) -;; (setq er/try-expand-list (append +;; (setq-local er/try-expand-list (append ;; er/try-expand-list ;; '(mark-paragraph ;; mark-page)))) -;; (er/enable-mode-expansions 'text-mode 'er/add-text-mode-expansions) +;; (er/enable-mode-expansions 'text-mode #'er/add-text-mode-expansions) ;; Add that to its own file, and require it at the bottom of this one, ;; where it says "Mode-specific expansions" diff --git a/elpa/expand-region-20221030.957/feature-mode-expansions.el b/elpa/expand-region-20241217.1840/feature-mode-expansions.el similarity index 93% rename from elpa/expand-region-20221030.957/feature-mode-expansions.el rename to elpa/expand-region-20241217.1840/feature-mode-expansions.el index e0abda29..a92cec22 100644 --- a/elpa/expand-region-20221030.957/feature-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/feature-mode-expansions.el @@ -1,6 +1,6 @@ -;;; feature-mode-expansions.el --- cucumber-specific expansions for expand-region +;;; feature-mode-expansions.el --- cucumber-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Raimon Grau +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Raimon Grau ;; Based on js-mode-expansions by: Raimon Grau @@ -63,6 +63,6 @@ '(er/mark-feature-scenario er/mark-feature-step)))) -(er/enable-mode-expansions 'feature-mode 'er/add-feature-mode-expansions) +(er/enable-mode-expansions 'feature-mode #'er/add-feature-mode-expansions) (provide 'feature-mode-expansions) diff --git a/elpa/expand-region-20221030.957/html-mode-expansions.el b/elpa/expand-region-20241217.1840/html-mode-expansions.el similarity index 85% rename from elpa/expand-region-20221030.957/html-mode-expansions.el rename to elpa/expand-region-20241217.1840/html-mode-expansions.el index 520bec71..19b4d028 100644 --- a/elpa/expand-region-20221030.957/html-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/html-mode-expansions.el @@ -1,6 +1,6 @@ -;;; html-mode-expansions.el --- HTML-specific expansions for expand-region +;;; html-mode-expansions.el --- HTML-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2011 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -36,10 +36,11 @@ (require 'sgml-mode) (defun er/mark-html-attribute () - "Mark html-attribute presumes that point is at the assignment part of attr=\"value\". + "Mark html-attribute. +Presumes that point is at the assignment part of attr=\"value\". If point is inside the value-string, the quotes will be marked first anyway. Does not support html-attributes with spaces -around the equal sign or unquotes attributes atm." +around the equal sign or unquoted attributes atm." (interactive) (when (or (looking-at "\\(\\s_\\|\\sw\\)*=") (er/looking-back-exact "=")) @@ -93,10 +94,10 @@ around the equal sign or unquotes attributes atm." er/mark-inner-tag er/mark-outer-tag)))) -(er/enable-mode-expansions 'html-mode 'er/add-html-mode-expansions) -(er/enable-mode-expansions 'rhtml-mode 'er/add-html-mode-expansions) -(er/enable-mode-expansions 'nxhtml-mode 'er/add-html-mode-expansions) -(er/enable-mode-expansions 'web-mode 'er/add-html-mode-expansions) +(er/enable-mode-expansions 'html-mode #'er/add-html-mode-expansions) +(er/enable-mode-expansions 'rhtml-mode #'er/add-html-mode-expansions) +(er/enable-mode-expansions 'nxhtml-mode #'er/add-html-mode-expansions) +(er/enable-mode-expansions 'web-mode #'er/add-html-mode-expansions) (provide 'html-mode-expansions) diff --git a/elpa/expand-region-20221030.957/js-mode-expansions.el b/elpa/expand-region-20241217.1840/js-mode-expansions.el similarity index 91% rename from elpa/expand-region-20221030.957/js-mode-expansions.el rename to elpa/expand-region-20241217.1840/js-mode-expansions.el index 3c912862..85e20e90 100644 --- a/elpa/expand-region-20221030.957/js-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/js-mode-expansions.el @@ -1,6 +1,6 @@ -;;; js-mode-expansions.el --- JS-specific expansions for expand-region +;;; js-mode-expansions.el --- JS-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2011 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -36,6 +36,7 @@ ;;; Code: (require 'expand-region-core) +(require 'er-basic-expansions) (defun er/mark-js-function () "Mark the current JavaScript function." @@ -72,7 +73,8 @@ (exchange-point-and-mark)) (defun er/mark-js-inner-return () - "Mark contents of the current return statement, not including return or semi-colon" +` "Mark contents of the current return statement. +Does not include return or semi-colon." (interactive) (condition-case nil (forward-char 6) @@ -128,7 +130,8 @@ (exchange-point-and-mark)) (defun er/mark-js-object-property () - "Mark js-object-property presumes that point is at the assignment part of key: value. + "Mark js-object-property. +Presumes that point is at the assignment part of key: value. If point is inside the value, that will be marked first anyway." (interactive) (when (or (looking-at "\"?\\(\\s_\\|\\sw\\| \\)*\":") @@ -178,9 +181,9 @@ If point is inside the value, that will be marked first anyway." er/mark-js-outer-return er/mark-js-call)))) -(er/enable-mode-expansions 'js-mode 'er/add-js-mode-expansions) -(er/enable-mode-expansions 'js2-mode 'er/add-js-mode-expansions) -(er/enable-mode-expansions 'js3-mode 'er/add-js-mode-expansions) +(er/enable-mode-expansions 'js-mode #'er/add-js-mode-expansions) +(er/enable-mode-expansions 'js2-mode #'er/add-js-mode-expansions) +(er/enable-mode-expansions 'js3-mode #'er/add-js-mode-expansions) (provide 'js-mode-expansions) diff --git a/elpa/expand-region-20221030.957/js2-mode-expansions.el b/elpa/expand-region-20241217.1840/js2-mode-expansions.el similarity index 92% rename from elpa/expand-region-20221030.957/js2-mode-expansions.el rename to elpa/expand-region-20241217.1840/js2-mode-expansions.el index d05b512c..122d65d0 100644 --- a/elpa/expand-region-20221030.957/js2-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/js2-mode-expansions.el @@ -1,6 +1,6 @@ -;;; js2-mode-expansions.el --- Additional expansions for js2-mode +;;; js2-mode-expansions.el --- Additional expansions for js2-mode -*- lexical-binding: t; -*- -;; Copyright (C) 2011 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -52,7 +52,7 @@ er/try-expand-list '(js2-mark-parent-statement)))) -(er/enable-mode-expansions 'js2-mode 'er/add-js2-mode-expansions) +(er/enable-mode-expansions 'js2-mode #'er/add-js2-mode-expansions) (provide 'js2-mode-expansions) diff --git a/elpa/expand-region-20221030.957/jsp-expansions.el b/elpa/expand-region-20241217.1840/jsp-expansions.el similarity index 92% rename from elpa/expand-region-20221030.957/jsp-expansions.el rename to elpa/expand-region-20241217.1840/jsp-expansions.el index deb56fa0..23309d36 100644 --- a/elpa/expand-region-20221030.957/jsp-expansions.el +++ b/elpa/expand-region-20241217.1840/jsp-expansions.el @@ -1,6 +1,6 @@ -;;; jsp-expansions.el --- JSP-specific expansions for expand-region +;;; jsp-expansions.el --- JSP-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2011 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Keywords: marking region @@ -57,7 +57,7 @@ If point is inside the brackets, they will be marked first anyway." er/try-expand-list '(er/mark-jstl-escape)))) -(er/enable-mode-expansions 'html-mode 'er/add-jsp-expansions) +(er/enable-mode-expansions 'html-mode #'er/add-jsp-expansions) (provide 'jsp-expansions) diff --git a/elpa/expand-region-20221030.957/latex-mode-expansions.el b/elpa/expand-region-20241217.1840/latex-mode-expansions.el similarity index 95% rename from elpa/expand-region-20221030.957/latex-mode-expansions.el rename to elpa/expand-region-20241217.1840/latex-mode-expansions.el index 74611a3c..48cc7130 100644 --- a/elpa/expand-region-20221030.957/latex-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/latex-mode-expansions.el @@ -1,6 +1,6 @@ -;;; latex-mode-expansions.el --- LaTeX-specific expansions for expand-region +;;; latex-mode-expansions.el --- LaTeX-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Ivan Andrus +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Ivan Andrus ;; Based on js-mode-expansions by: Magnar Sveen @@ -96,7 +96,7 @@ Skips past [] and {} arguments to the environment." er/mark-LaTeX-math)))) (let ((latex-mode-hook LaTeX-mode-hook)) - (er/enable-mode-expansions 'latex-mode 'er/add-latex-mode-expansions) + (er/enable-mode-expansions 'latex-mode #'er/add-latex-mode-expansions) (setq LaTeX-mode-hook latex-mode-hook)) (provide 'latex-mode-expansions) diff --git a/elpa/expand-region-20221030.957/nxml-mode-expansions.el b/elpa/expand-region-20241217.1840/nxml-mode-expansions.el similarity index 95% rename from elpa/expand-region-20221030.957/nxml-mode-expansions.el rename to elpa/expand-region-20241217.1840/nxml-mode-expansions.el index c81b5904..7fe2deed 100644 --- a/elpa/expand-region-20221030.957/nxml-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/nxml-mode-expansions.el @@ -1,6 +1,6 @@ -;;; nxml-mode-expansions.el --- Nxml-specific expansions for expand-region +;;; nxml-mode-expansions.el --- Nxml-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Ivan Andrus +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Ivan Andrus ;; Based on js-mode-expansions by: Magnar Sveen @@ -118,7 +118,7 @@ point is in, or otherwise nil" (remove 'er/mark-symbol-with-prefix (remove 'er/mark-symbol er/try-expand-list)))))) -(er/enable-mode-expansions 'nxml-mode 'er/add-nxml-mode-expansions) +(er/enable-mode-expansions 'nxml-mode #'er/add-nxml-mode-expansions) (provide 'nxml-mode-expansions) diff --git a/elpa/expand-region-20221030.957/octave-expansions.el b/elpa/expand-region-20241217.1840/octave-expansions.el similarity index 94% rename from elpa/expand-region-20221030.957/octave-expansions.el rename to elpa/expand-region-20241217.1840/octave-expansions.el index 4b22f895..8866d20b 100644 --- a/elpa/expand-region-20221030.957/octave-expansions.el +++ b/elpa/expand-region-20241217.1840/octave-expansions.el @@ -1,6 +1,6 @@ -;;; octave-expansions.el --- octave-mode expansions for expand-region +;;; octave-expansions.el --- octave-mode expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Mark Hepburn +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Mark Hepburn ;; Keywords: marking region @@ -72,7 +72,7 @@ behaviour of `octave-mark-block' between emacs versions 23 and (set (make-local-variable 'er/try-expand-list) (append er/try-expand-list try-expand-list-additions)))) -(er/enable-mode-expansions 'octave-mode 'er/add-octave-expansions) +(er/enable-mode-expansions 'octave-mode #'er/add-octave-expansions) (provide 'octave-expansions) ;;; octave-expansions.el ends here diff --git a/elpa/expand-region-20221030.957/python-el-expansions.el b/elpa/expand-region-20241217.1840/python-el-expansions.el similarity index 94% rename from elpa/expand-region-20221030.957/python-el-expansions.el rename to elpa/expand-region-20241217.1840/python-el-expansions.el index 2b258a99..21aaa22b 100644 --- a/elpa/expand-region-20221030.957/python-el-expansions.el +++ b/elpa/expand-region-20241217.1840/python-el-expansions.el @@ -1,6 +1,6 @@ -;;; python-el-expansions.el --- Python-specific expansions for expand-region +;;; python-el-expansions.el --- Python-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Ivan Andrus +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Authors: Ivan Andrus, Felix Geller, @edmccard ;; Based on js-mode-expansions by: Magnar Sveen @@ -85,7 +85,7 @@ (remove 'er/mark-outside-quotes (append er/try-expand-list try-expand-list-additions)))))) -(er/enable-mode-expansions 'python-mode 'er/add-python-mode-expansions) +(er/enable-mode-expansions 'python-mode #'er/add-python-mode-expansions) (provide 'python-el-expansions) diff --git a/elpa/expand-region-20221030.957/python-el-fgallina-expansions.el b/elpa/expand-region-20241217.1840/python-el-fgallina-expansions.el similarity index 94% rename from elpa/expand-region-20221030.957/python-el-fgallina-expansions.el rename to elpa/expand-region-20241217.1840/python-el-fgallina-expansions.el index bcfe10a7..148dccf2 100644 --- a/elpa/expand-region-20221030.957/python-el-fgallina-expansions.el +++ b/elpa/expand-region-20241217.1840/python-el-fgallina-expansions.el @@ -1,6 +1,6 @@ -;;; python-el-fgallina-expansions.el --- fgallina/python.el-specific expansions for expand-region +;;; python-el-fgallina-expansions.el --- fgallina/python.el-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Felix Geller +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Felix Geller ;; Keywords: marking region python @@ -34,9 +34,9 @@ (require 'expand-region-core) (if (not (fboundp 'python-syntax-context)) - (defalias 'python-syntax-context 'python-info-ppss-context)) + (defalias 'python-syntax-context #'python-info-ppss-context)) (if (not (fboundp 'python-indent-offset)) - (defalias 'python-indent-offset 'python-indent)) + (defalias 'python-indent-offset #'python-indent)) (defvar er--python-string-delimiter "'\"" @@ -123,7 +123,7 @@ than NEXT-INDENT-LEVEL." ;; No need to go beyond the end of the buffer. Can't use ;; eobp as the loop places the point at the beginning of ;; line, but eob might be at the end of the line. - (not (= (point-max) (point-at-eol))) + (not (= (point-max) (line-end-position))) ;; Proceed if: indentation is too deep (or (> (current-indentation) block-indentation) ;; Looking at an empty line @@ -186,7 +186,7 @@ Command that wraps `er/mark-python-block'." (remove 'er/mark-outside-quotes (append er/try-expand-list try-expand-list-additions)))))) -(er/enable-mode-expansions 'python-mode 'er/add-python-mode-expansions) +(er/enable-mode-expansions 'python-mode #'er/add-python-mode-expansions) (provide 'python-el-fgallina-expansions) diff --git a/elpa/expand-region-20221030.957/python-mode-expansions.el b/elpa/expand-region-20241217.1840/python-mode-expansions.el similarity index 95% rename from elpa/expand-region-20221030.957/python-mode-expansions.el rename to elpa/expand-region-20241217.1840/python-mode-expansions.el index 6b74dbf8..690fe9b0 100644 --- a/elpa/expand-region-20221030.957/python-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/python-mode-expansions.el @@ -1,6 +1,6 @@ -;;; python-mode-expansions.el --- python-mode-specific expansions for expand-region +;;; python-mode-expansions.el --- python-mode-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Felix Geller +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Felix Geller ;; Based on python-mode-expansions by: Ivan Andrus @@ -43,7 +43,7 @@ (defvar er--python-string-delimiter "'\"") -(defalias 'py-goto-beyond-clause 'py-end-of-clause-bol) +(defalias 'py-goto-beyond-clause #'py-end-of-clause-bol) (declare-function py-in-string-p "python-mode") (declare-function py-beginning-of-block "python-mode") @@ -140,7 +140,7 @@ line and selecting the surrounding block." (remove 'er/mark-outside-quotes (append er/try-expand-list try-expand-list-additions)))))) -(er/enable-mode-expansions 'python-mode 'er/add-python-mode-expansions) +(er/enable-mode-expansions 'python-mode #'er/add-python-mode-expansions) (provide 'python-mode-expansions) diff --git a/elpa/expand-region-20221030.957/ruby-mode-expansions.el b/elpa/expand-region-20241217.1840/ruby-mode-expansions.el similarity index 87% rename from elpa/expand-region-20221030.957/ruby-mode-expansions.el rename to elpa/expand-region-20241217.1840/ruby-mode-expansions.el index 32067bad..03f38f09 100644 --- a/elpa/expand-region-20221030.957/ruby-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/ruby-mode-expansions.el @@ -1,6 +1,6 @@ -;;; ruby-mode-expansions.el --- ruby-specific expansions for expand-region +;;; ruby-mode-expansions.el --- ruby-specific expansions for expand-region -*- lexical-binding: t; -*- -;; Copyright (C) 2011 Magnar Sveen +;; Copyright (C) 2011-2023 Free Software Foundation, Inc ;; Author: Matt Briggs ;; Based on js-mode-expansions by: Magnar Sveen @@ -36,7 +36,9 @@ ;; ;;; Code: +(eval-when-compile (require 'cl-lib)) (require 'expand-region-core) +(require 'er-basic-expansions) (require 'ruby-mode) (defvar er/ruby-block-end-re @@ -55,7 +57,7 @@ This moves point to the next line to include the end of the block" (interactive "p") ;; Workaround for `ruby-end-of-block' in Emacs 23. (when (re-search-forward (concat "\\<\\(" ruby-block-beg-re "\\)\\>") - (point-at-eol) t) + (line-end-position) t) (goto-char (match-beginning 0))) (ruby-end-of-block (or arg 1)) (er/ruby-skip-past-block-end)) @@ -89,15 +91,14 @@ This moves point to the next line to include the end of the block" (when (= (point) (point-min)) (cl-return)) (ruby-end-of-block) - (setq progress-end (if (looking-at-p er/ruby-block-end-re) - (point-at-bol 0) - (point-at-bol 1))) + (setq progress-end (line-beginning-position + (if (looking-at-p er/ruby-block-end-re) 0 1))) (goto-char progress-beg) (when (> progress-end orig-point) (cl-return)))))) -;;; This command isn't used here explicitly, but it's symmetrical with -;;; `er/ruby-backward-up', and nifty for interactive use. +;; This command isn't used here explicitly, but it's symmetrical with +;; `er/ruby-backward-up', and nifty for interactive use. (defun er/ruby-forward-up () "a la `paredit-forward-up'" (interactive) @@ -109,13 +110,12 @@ This moves point to the next line to include the end of the block" (setq pos (or pos (point))) (save-excursion (goto-char pos) - (let (beg end) - (cons (progn - (er/ruby-backward-up) - (er/point-at-indentation)) - (progn - (er/ruby-end-of-block) - (point)))))) + (cons (progn + (er/ruby-backward-up) + (er/point-at-indentation)) + (progn + (er/ruby-end-of-block) + (point))))) (defun er/mark-ruby-block-up-1 () (er/ruby-backward-up) @@ -136,12 +136,12 @@ This moves point to the next line to include the end of the block" (forward-line 0) (back-to-indentation) (cond ((looking-at-p er/ruby-block-end-re) - (point-at-bol 0)) + (line-beginning-position 0)) ((re-search-forward (concat "\\<\\(" ruby-block-beg-re "\\)\\>") - (point-at-eol) + (line-end-position) t) - (point-at-bol 2))) ) + (line-beginning-position 2))) ) (point))) (prev-block-info (er/get-ruby-block prev-block-point)) (prev-block-beg (car prev-block-info)) @@ -200,5 +200,5 @@ be marked first anyway." er/mark-ruby-block-up er/mark-ruby-heredoc))))) -(er/enable-mode-expansions 'ruby-mode 'er/add-ruby-mode-expansions) +(er/enable-mode-expansions 'ruby-mode #'er/add-ruby-mode-expansions) (provide 'ruby-mode-expansions) diff --git a/elpa/expand-region-20221030.957/sml-mode-expansions.el b/elpa/expand-region-20241217.1840/sml-mode-expansions.el similarity index 91% rename from elpa/expand-region-20221030.957/sml-mode-expansions.el rename to elpa/expand-region-20241217.1840/sml-mode-expansions.el index 22581dd1..1af2fc2e 100644 --- a/elpa/expand-region-20221030.957/sml-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/sml-mode-expansions.el @@ -1,6 +1,6 @@ -;;; sml-mode-expansions.el --- Expansions for expand-region to be used in sml-mode +;;; sml-mode-expansions.el --- Expansions for expand-region to be used in sml-mode -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Alexis Gallagher +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Alexis Gallagher ;; Based on js-mode-expansions by: Magnar Sveen @@ -57,7 +57,7 @@ er/sml-mark-keyword-prefixed-expression mark-sexp)))) -(er/enable-mode-expansions 'sml-mode 'er/add-sml-mode-expansions) +(er/enable-mode-expansions 'sml-mode #'er/add-sml-mode-expansions) (provide 'sml-mode-expansions) diff --git a/elpa/expand-region-20221030.957/subword-mode-expansions.el b/elpa/expand-region-20241217.1840/subword-mode-expansions.el similarity index 93% rename from elpa/expand-region-20221030.957/subword-mode-expansions.el rename to elpa/expand-region-20241217.1840/subword-mode-expansions.el index cf88f78d..2e660025 100644 --- a/elpa/expand-region-20221030.957/subword-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/subword-mode-expansions.el @@ -1,6 +1,6 @@ -;;; subword-mode-expansions.el --- Expansions for subword-mode to be used for CamelCase +;;; subword-mode-expansions.el --- Expansions for subword-mode to be used for CamelCase -*- lexical-binding: t; -*- -;; Copyright (C) 2014 Lefteris Karapetsas +;; Copyright (C) 2014-2023 Free Software Foundation, Inc ;; Author: Lefteris Karapetsas ;; Keywords: marking region diff --git a/elpa/expand-region-20221030.957/text-mode-expansions.el b/elpa/expand-region-20241217.1840/text-mode-expansions.el similarity index 92% rename from elpa/expand-region-20221030.957/text-mode-expansions.el rename to elpa/expand-region-20241217.1840/text-mode-expansions.el index 2789b158..628443bb 100644 --- a/elpa/expand-region-20221030.957/text-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/text-mode-expansions.el @@ -1,6 +1,6 @@ -;;; text-mode-expansions.el --- Expansions for expand-region to be used in text +;;; text-mode-expansions.el --- Expansions for expand-region to be used in text -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Ivan Andrus +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Ivan Andrus ;; Based on js-mode-expansions by: Magnar Sveen @@ -58,7 +58,7 @@ text-mode-expansions don't work well in `html-mode'." er/mark-text-paragraph mark-page))))) -(er/enable-mode-expansions 'text-mode 'er/add-text-mode-expansions) +(er/enable-mode-expansions 'text-mode #'er/add-text-mode-expansions) (provide 'text-mode-expansions) diff --git a/elpa/expand-region-20221030.957/the-org-mode-expansions.el b/elpa/expand-region-20241217.1840/the-org-mode-expansions.el similarity index 94% rename from elpa/expand-region-20221030.957/the-org-mode-expansions.el rename to elpa/expand-region-20241217.1840/the-org-mode-expansions.el index 571bc3d9..a3b09cdf 100644 --- a/elpa/expand-region-20221030.957/the-org-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/the-org-mode-expansions.el @@ -1,6 +1,6 @@ -;;; the-org-mode-expansions.el --- Expansions for expand-region to be used in org-mode +;;; the-org-mode-expansions.el --- Expansions for expand-region to be used in org-mode -*- lexical-binding: t; -*- -;; Copyright (C) 2012 Magnar Sveen +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Author: Magnar Sveen ;; Based on text-mode-expansions by: Ivan Andrus @@ -32,6 +32,7 @@ ;;; Code: (require 'expand-region-core) +(require 'er-basic-expansions) (require 'org-macs) (require 'org-element) @@ -114,6 +115,6 @@ (set (make-local-variable 'er/save-mode-excursion) #'er/save-org-mode-excursion)) -(er/enable-mode-expansions 'org-mode 'er/add-org-mode-expansions) +(er/enable-mode-expansions 'org-mode #'er/add-org-mode-expansions) (provide 'the-org-mode-expansions) diff --git a/elpa/expand-region-20221030.957/web-mode-expansions.el b/elpa/expand-region-20241217.1840/web-mode-expansions.el similarity index 84% rename from elpa/expand-region-20221030.957/web-mode-expansions.el rename to elpa/expand-region-20241217.1840/web-mode-expansions.el index fc099d4e..8fad2efb 100644 --- a/elpa/expand-region-20221030.957/web-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/web-mode-expansions.el @@ -1,7 +1,7 @@ -;;; web-mode-expansions.el --- Thin layer for adapting fxbois's web-mode-mark-and-expand function +;;; web-mode-expansions.el --- Thin layer for adapting fxbois's web-mode-mark-and-expand function -*- lexical-binding: t; -*- ;;; to expand-region -;; Copyright (C) 2012 Rotem Yaari +;; Copyright (C) 2012-2023 Free Software Foundation, Inc ;; Authors: Rotem Yaari ;; Based on, and makes use of web-mode.el by fxbois @@ -27,6 +27,6 @@ (set (make-local-variable 'er/try-expand-list) (cons 'web-mode-mark-and-expand er/try-expand-list))) -(er/enable-mode-expansions 'web-mode 'er/add-web-mode-expansions) +(er/enable-mode-expansions 'web-mode #'er/add-web-mode-expansions) (provide 'web-mode-expansions) diff --git a/elpa/expand-region-20221030.957/yaml-mode-expansions.el b/elpa/expand-region-20241217.1840/yaml-mode-expansions.el similarity index 88% rename from elpa/expand-region-20221030.957/yaml-mode-expansions.el rename to elpa/expand-region-20241217.1840/yaml-mode-expansions.el index 902285f1..7bc4aeb7 100644 --- a/elpa/expand-region-20221030.957/yaml-mode-expansions.el +++ b/elpa/expand-region-20241217.1840/yaml-mode-expansions.el @@ -1,6 +1,6 @@ -;;; yaml-mode-expansions.el --- expansions for yaml mode +;;; yaml-mode-expansions.el --- expansions for yaml mode -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Aaron Gonzales +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; Author: Aaron Gonzales ;; Keywords: marking region yaml YAML expand @@ -35,7 +35,7 @@ (defconst yaml-indent 2) (unless (fboundp 'yaml-indent-offset) - (defalias 'yaml-indent-offset 'yaml-indent)) + (defalias 'yaml-indent-offset #'yaml-indent)) (defvar er--yaml-key-value-regex (rx (one-or-more @@ -61,7 +61,7 @@ "Return the indentation level of the code with respect to the REGEX passed." (when (looking-at regex) ;; Block start means that the next level is deeper. - (+ (current-indentation) yaml-indent-offset) + (+ (current-indentation) yaml-indent-offset) ;FIXME: Unused? ;; Assuming we're inside the block that we want to mark (current-indentation))) @@ -72,7 +72,7 @@ (set-mark (line-end-position)))) (defun er/mark-yaml-block-static-base (regex) - "Mark yaml block based on REGEX passed. NEXT-INDENT-LEVEL can be used to search outer blocks when necessary." + "Mark yaml block based on REGEX passed." ;; go bac to indentation so always can get regexp (back-to-indentation) ;; make sure the cursor is set inside the block @@ -85,7 +85,7 @@ ;; No need to go beyond the end of the buffer. Can't use ;; eobp as the loop places the point at the beginning of ;; line, but eob might be at the end of the line. - (not (= (point-max) (point-at-eol))) + (not (= (point-max) (line-end-position))) ;; Proceed if: indentation is too deep (or (> (current-indentation) block-indentation) ;; Looking at an empty line @@ -102,7 +102,8 @@ (back-to-indentation)) (defun er/mark-yaml-block-base (regex &optional next-indent-level) - "Mark yaml block based on REGEX passed. NEXT-INDENT-LEVEL can be used to search outer blocks when necessary." + "Mark yaml block based on REGEX passed. +NEXT-INDENT-LEVEL can be used to search outer blocks when necessary." ;; go bac to indentation so always can get regexp (back-to-indentation) ;; make sure the cursor is set inside the block @@ -128,7 +129,7 @@ ;; No need to go beyond the end of the buffer. Can't use ;; eobp as the loop places the point at the beginning of ;; line, but eob might be at the end of the line. - (not (= (point-max) (point-at-eol))) + (not (= (point-max) (line-end-position))) ;; Proceed if: indentation is too deep (or (> (current-indentation) block-indentation) ;; Looking at an empty line @@ -155,19 +156,22 @@ (er/mark-yaml-line-base er--yaml-list-item-regex)) (defun er/mark-yaml-inner-block () - "Mark the yaml contents of the block at point. Command that wraps `er/mark-yaml-block-base'." + "Mark the yaml contents of the block at point. +Command that wraps `er/mark-yaml-block-base'." (interactive) (er/mark-yaml-block-base er--yaml-block-regex (current-indentation)) (forward-line) (back-to-indentation)) (defun er/mark-yaml-block () - "Mark the yaml block that point is currently at the top of. Command that wraps `er/mark-yaml-block-base'." + "Mark the yaml block that point is currently at the top of. +Command that wraps `er/mark-yaml-block-base'." (interactive) (er/mark-yaml-block-static-base er--yaml-block-regex)) (defun er/mark-yaml-outer-block () - "Mark the outer yaml block that surrounds the block around point. Command that wraps `er/mark-yaml-block-base'." + "Mark the outer yaml block that surrounds the block around point. +Command that wraps `er/mark-yaml-block-base'." (interactive) (er/mark-yaml-block-base er--yaml-block-regex (current-indentation))) @@ -183,7 +187,7 @@ (set (make-local-variable 'expand-region-skip-whitespace) nil) (set (make-local-variable 'er/try-expand-list) try-expand-list-additions))) -(er/enable-mode-expansions 'yaml-mode 'er/add-yaml-mode-expansions) +(er/enable-mode-expansions 'yaml-mode #'er/add-yaml-mode-expansions) (provide 'yaml-mode-expansions) diff --git a/elpa/expand-region-readme.txt b/elpa/expand-region-readme.txt deleted file mode 100644 index f7d9ca37..00000000 --- a/elpa/expand-region-readme.txt +++ /dev/null @@ -1,112 +0,0 @@ -Expand region increases the selected region by semantic units. Just keep -pressing the key until it selects what you want. - -An example: - - (setq alphabet-start "abc def") - -With the cursor at the `c`, it starts by marking the entire word `abc`, then -expand to the contents of the quotes `abc def`, then to the entire quote -`"abc def"`, then to the contents of the sexp `setq alphabet-start "abc def"` -and finally to the entire sexp. - -You can set it up like this: - - (require 'expand-region) - (global-set-key (kbd "C-=") 'er/expand-region) - -There's also `er/contract-region` if you expand too far. - -## Video - -You can [watch an intro to expand-region at Emacs Rocks](http://emacsrocks.com/e09.html). - -## Language support - -Expand region works fairly well with most languages, due to the general -nature of the basic expansions: - - er/mark-word - er/mark-symbol - er/mark-method-call - er/mark-inside-quotes - er/mark-outside-quotes - er/mark-inside-pairs - er/mark-outside-pairs - -However, most languages also will benefit from some specially crafted -expansions. For instance, expand-region comes with these extra expansions for -html-mode: - - er/mark-html-attribute - er/mark-inner-tag - er/mark-outer-tag - -You can add your own expansions to the languages of your choice simply by -creating a function that looks around point to see if it's inside or looking -at the construct you want to mark, and if so - mark it. - -There's plenty of examples to look at in these files. - -After you make your function, add it to a buffer-local version of -the `er/try-expand-list`. - -**Example:** - -Let's say you want expand-region to also mark paragraphs and pages in -text-mode. Incidentally Emacs already comes with `mark-paragraph` and -`mark-page`. To add it to the try-list, do this: - - (defun er/add-text-mode-expansions () - (make-variable-buffer-local 'er/try-expand-list) - (setq er/try-expand-list (append - er/try-expand-list - '(mark-paragraph - mark-page)))) - - (er/enable-mode-expansions 'text-mode 'er/add-text-mode-expansions) - -Add that to its own file, and require it at the bottom of this one, -where it says "Mode-specific expansions" - -**Warning:** Badly written expansions might slow down expand-region -dramatically. Remember to exit quickly before you start traversing -the entire document looking for constructs to mark. - -## Contribute - -If you make some nice expansions for your favorite mode, it would be -great if you opened a pull-request. The repo is at: - - https://github.com/magnars/expand-region.el - -Changes to `expand-region-core` itself must be accompanied by feature tests. -They are written in [Ecukes](http://ecukes.info), a Cucumber for Emacs. - -To fetch the test dependencies: - - $ cd /path/to/expand-region - $ git submodule init - $ git submodule update - -Run the tests with: - - $ ./util/ecukes/ecukes features - -If you want to add feature-tests for your mode-specific expansions as well, -that is utterly excellent. - -## Contributors - -* [Josh Johnston](https://github.com/joshwnj) contributed `er/contract-region` -* [Le Wang](https://github.com/lewang) contributed consistent handling of the mark ring, expanding into pairs/quotes just left of the cursor, and general code clean-up. -* [Matt Briggs](https://github.com/mbriggs) contributed expansions for ruby-mode. -* [Ivan Andrus](https://github.com/gvol) contributed expansions for python-mode, text-mode, LaTeX-mode and nxml-mode. -* [Raimon Grau](https://github.com/kidd) added support for when transient-mark-mode is off. -* [Gleb Peregud](https://github.com/gleber) contributed expansions for erlang-mode. -* [fgeller](https://github.com/fgeller) and [edmccard](https://github.com/edmccard) contributed better support for python and its multiple modes. -* [François Févotte](https://github.com/ffevotte) contributed expansions for C and C++. -* [Roland Walker](https://github.com/rolandwalker) added option to copy the contents of the most recent action to a register, and some fixes. -* [Damien Cassou](https://github.com/DamienCassou) added option to continue expanding/contracting with fast keys after initial expand. - -Thanks! -- 2.47.3