branch: externals/expand-region
commit bd23f6d3b12f9514b4c5293992bc8f3a0b18b455
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Fix copyright and packaging for GNU ELPA
* expand-region.el: Add `Version:` and `URL:` headers.
* expand-region-pkg.el: Delete since GNU ELPA auto-generates it.
* ruby-mode-expansions.el: Require `cl` to fix miscompilation.
* .gitignore: Add ELPA-generated files.
* <foo>.el files: Fix copyright header.
---
.gitignore | 2 ++
cc-mode-expansions.el | 2 +-
clojure-mode-expansions.el | 2 +-
cperl-mode-expansions.el | 2 +-
css-mode-expansions.el | 2 +-
enh-ruby-mode-expansions.el | 2 +-
er-basic-expansions.el | 2 +-
erlang-mode-expansions.el | 2 +-
expand-region-core.el | 2 +-
expand-region-custom.el | 2 +-
expand-region-pkg.el | 2 --
expand-region.el | 4 +++-
feature-mode-expansions.el | 2 +-
features/step-definitions/expand-region-steps.el | 2 ++
features/support/env.el | 2 ++
html-mode-expansions.el | 2 +-
js-mode-expansions.el | 2 +-
js2-mode-expansions.el | 2 +-
jsp-expansions.el | 2 +-
latex-mode-expansions.el | 2 +-
nxml-mode-expansions.el | 2 +-
octave-expansions.el | 2 +-
python-el-expansions.el | 2 +-
python-el-fgallina-expansions.el | 2 +-
python-mode-expansions.el | 2 +-
ruby-mode-expansions.el | 3 ++-
sml-mode-expansions.el | 2 +-
subword-mode-expansions.el | 2 +-
text-mode-expansions.el | 2 +-
the-org-mode-expansions.el | 2 +-
web-mode-expansions.el | 2 +-
31 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6ea3795..12e2717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+expand-region-autoloads.el
+expand-region-pkg.el
*.elc
.rvmrc
/TAGS
diff --git a/cc-mode-expansions.el b/cc-mode-expansions.el
index 9effbec..73713cf 100644
--- a/cc-mode-expansions.el
+++ b/cc-mode-expansions.el
@@ -1,6 +1,6 @@
;;; cc-mode-expansions.el --- C-specific expansions for expand-region
-;; Copyright (C) 2012 François Févotte
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: François Févotte
;; Based on js-mode-expansions by: Magnar Sveen <magn...@gmail.com>
diff --git a/clojure-mode-expansions.el b/clojure-mode-expansions.el
index 4598039..73bcabe 100644
--- a/clojure-mode-expansions.el
+++ b/clojure-mode-expansions.el
@@ -1,6 +1,6 @@
;;; clojure-mode-expansions.el --- Clojure-specific expansions for
expand-region
-;; Copyright (C) 2011 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/cperl-mode-expansions.el b/cperl-mode-expansions.el
index 1fe24ea..59a3809 100644
--- a/cperl-mode-expansions.el
+++ b/cperl-mode-expansions.el
@@ -1,6 +1,6 @@
;;; cperl-mode-expansions.el --- perl-specific expansions for expand-region
-;; Copyright (C) 2012 Kang-min Liu
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Kang-min Liu <gu...@gugod.org>
;; Keywords: marking region cperl
diff --git a/css-mode-expansions.el b/css-mode-expansions.el
index 8f826a2..0db4c6a 100644
--- a/css-mode-expansions.el
+++ b/css-mode-expansions.el
@@ -1,6 +1,6 @@
;;; css-mode-expansions.el --- CSS-specific expansions for expand-region
-;; Copyright (C) 2011 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/enh-ruby-mode-expansions.el b/enh-ruby-mode-expansions.el
index 145beb2..dfaefdf 100644
--- a/enh-ruby-mode-expansions.el
+++ b/enh-ruby-mode-expansions.el
@@ -1,6 +1,6 @@
;;; enh-ruby-mode-expansions.el --- Expansions for enh-ruby-mode
-;; Copyright (C) 2011 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/er-basic-expansions.el b/er-basic-expansions.el
index 3c4ef6b..2da114d 100644
--- a/er-basic-expansions.el
+++ b/er-basic-expansions.el
@@ -1,6 +1,6 @@
;;; er-basic-expansions.el --- Words, symbols, strings, et al
-;; Copyright (C) 2011-2013 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/erlang-mode-expansions.el b/erlang-mode-expansions.el
index 14bfce4..9f0ec3c 100644
--- a/erlang-mode-expansions.el
+++ b/erlang-mode-expansions.el
@@ -1,6 +1,6 @@
;;; erlang-mode-expansions.el --- Erlang-specific expansions for expand-region
-;; Copyright (C) 2012 Gleb Peregud
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Gleb Peregud
;; Based on python-mode-expansions by: Ivan Andrus <darthand...@gmail.com>
diff --git a/expand-region-core.el b/expand-region-core.el
index 2864b9a..4171d02 100644
--- a/expand-region-core.el
+++ b/expand-region-core.el
@@ -1,6 +1,6 @@
;;; expand-region-core.el --- Increase selected region by semantic units.
-;; Copyright (C) 2011-2013 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/expand-region-custom.el b/expand-region-custom.el
index 6d01bd2..ff87587 100644
--- a/expand-region-custom.el
+++ b/expand-region-custom.el
@@ -1,6 +1,6 @@
;;; expand-region-custom.el --- Increase selected region by semantic units.
-;; Copyright (C) 2012 Magnar Sveen
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/expand-region-pkg.el b/expand-region-pkg.el
deleted file mode 100644
index 63542a3..0000000
--- a/expand-region-pkg.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(define-package "expand-region" "0.11.0"
- "Increase selected region by semantic units.")
diff --git a/expand-region.el b/expand-region.el
index 1c6d4b4..c6fcbd7 100644
--- a/expand-region.el
+++ b/expand-region.el
@@ -1,9 +1,11 @@
;;; expand-region.el --- Increase selected region by semantic units.
-;; Copyright (C) 2011 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
+;; URL: https://github.com/magnars/expand-region.el
+;; Version: 0.11.0
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
diff --git a/feature-mode-expansions.el b/feature-mode-expansions.el
index e0abda2..18a3654 100644
--- a/feature-mode-expansions.el
+++ b/feature-mode-expansions.el
@@ -1,6 +1,6 @@
;;; feature-mode-expansions.el --- cucumber-specific expansions for
expand-region
-;; Copyright (C) 2012 Raimon Grau
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Raimon Grau
;; Based on js-mode-expansions by: Raimon Grau <raimons...@gmail.com>
diff --git a/features/step-definitions/expand-region-steps.el
b/features/step-definitions/expand-region-steps.el
index f73967d..107498a 100644
--- a/features/step-definitions/expand-region-steps.el
+++ b/features/step-definitions/expand-region-steps.el
@@ -1,3 +1,5 @@
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
+
(Given "^mark is inactive by default$"
(lambda ()
(setq set-mark-default-inactive t)))
diff --git a/features/support/env.el b/features/support/env.el
index 2246768..83d0fbf 100644
--- a/features/support/env.el
+++ b/features/support/env.el
@@ -1,3 +1,5 @@
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
+
(let* ((current-directory (file-name-directory load-file-name))
(features-directory (expand-file-name ".." current-directory))
(project-directory (expand-file-name ".." features-directory)))
diff --git a/html-mode-expansions.el b/html-mode-expansions.el
index 520bec7..1ca7552 100644
--- a/html-mode-expansions.el
+++ b/html-mode-expansions.el
@@ -1,6 +1,6 @@
;;; html-mode-expansions.el --- HTML-specific expansions for expand-region
-;; Copyright (C) 2011 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/js-mode-expansions.el b/js-mode-expansions.el
index 3c91286..3f0df19 100644
--- a/js-mode-expansions.el
+++ b/js-mode-expansions.el
@@ -1,6 +1,6 @@
;;; js-mode-expansions.el --- JS-specific expansions for expand-region
-;; Copyright (C) 2011 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/js2-mode-expansions.el b/js2-mode-expansions.el
index d05b512..71dc8cc 100644
--- a/js2-mode-expansions.el
+++ b/js2-mode-expansions.el
@@ -1,6 +1,6 @@
;;; js2-mode-expansions.el --- Additional expansions for js2-mode
-;; Copyright (C) 2011 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/jsp-expansions.el b/jsp-expansions.el
index deb56fa..40a823e 100644
--- a/jsp-expansions.el
+++ b/jsp-expansions.el
@@ -1,6 +1,6 @@
;;; jsp-expansions.el --- JSP-specific expansions for expand-region
-;; Copyright (C) 2011 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen <magn...@gmail.com>
;; Keywords: marking region
diff --git a/latex-mode-expansions.el b/latex-mode-expansions.el
index 74611a3..487bca4 100644
--- a/latex-mode-expansions.el
+++ b/latex-mode-expansions.el
@@ -1,6 +1,6 @@
;;; latex-mode-expansions.el --- LaTeX-specific expansions for expand-region
-;; Copyright (C) 2012 Ivan Andrus
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Ivan Andrus
;; Based on js-mode-expansions by: Magnar Sveen <magn...@gmail.com>
diff --git a/nxml-mode-expansions.el b/nxml-mode-expansions.el
index c81b590..cd3856c 100644
--- a/nxml-mode-expansions.el
+++ b/nxml-mode-expansions.el
@@ -1,6 +1,6 @@
;;; nxml-mode-expansions.el --- Nxml-specific expansions for expand-region
-;; Copyright (C) 2012 Ivan Andrus
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Ivan Andrus
;; Based on js-mode-expansions by: Magnar Sveen <magn...@gmail.com>
diff --git a/octave-expansions.el b/octave-expansions.el
index 4b22f89..eb4456f 100644
--- a/octave-expansions.el
+++ b/octave-expansions.el
@@ -1,6 +1,6 @@
;;; octave-expansions.el --- octave-mode expansions for expand-region
-;; Copyright (C) 2012 Mark Hepburn
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Mark Hepburn
;; Keywords: marking region
diff --git a/python-el-expansions.el b/python-el-expansions.el
index 2b258a9..56b20b5 100644
--- a/python-el-expansions.el
+++ b/python-el-expansions.el
@@ -1,6 +1,6 @@
;;; python-el-expansions.el --- Python-specific expansions for expand-region
-;; Copyright (C) 2012 Ivan Andrus
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Authors: Ivan Andrus, Felix Geller, @edmccard
;; Based on js-mode-expansions by: Magnar Sveen <magn...@gmail.com>
diff --git a/python-el-fgallina-expansions.el b/python-el-fgallina-expansions.el
index bcfe10a..a70f312 100644
--- a/python-el-fgallina-expansions.el
+++ b/python-el-fgallina-expansions.el
@@ -1,6 +1,6 @@
;;; python-el-fgallina-expansions.el --- fgallina/python.el-specific
expansions for expand-region
-;; Copyright (C) 2012 Felix Geller
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Felix Geller
;; Keywords: marking region python
diff --git a/python-mode-expansions.el b/python-mode-expansions.el
index 6b74dbf..075d3a2 100644
--- a/python-mode-expansions.el
+++ b/python-mode-expansions.el
@@ -1,6 +1,6 @@
;;; python-mode-expansions.el --- python-mode-specific expansions for
expand-region
-;; Copyright (C) 2012 Felix Geller
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Felix Geller
;; Based on python-mode-expansions by: Ivan Andrus
diff --git a/ruby-mode-expansions.el b/ruby-mode-expansions.el
index 27260ee..3a66c2e 100644
--- a/ruby-mode-expansions.el
+++ b/ruby-mode-expansions.el
@@ -1,6 +1,6 @@
;;; ruby-mode-expansions.el --- ruby-specific expansions for expand-region
-;; Copyright (C) 2011 Magnar Sveen
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc
;; Author: Matt Briggs
;; Based on js-mode-expansions by: Magnar Sveen <magn...@gmail.com>
@@ -36,6 +36,7 @@
;;
;;; Code:
+(eval-when-compile (require 'cl))
(require 'expand-region-core)
(require 'ruby-mode)
diff --git a/sml-mode-expansions.el b/sml-mode-expansions.el
index 22581dd..296a318 100644
--- a/sml-mode-expansions.el
+++ b/sml-mode-expansions.el
@@ -1,6 +1,6 @@
;;; sml-mode-expansions.el --- Expansions for expand-region to be used in
sml-mode
-;; Copyright (C) 2012 Alexis Gallagher
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Alexis Gallagher
;; Based on js-mode-expansions by: Magnar Sveen <magn...@gmail.com>
diff --git a/subword-mode-expansions.el b/subword-mode-expansions.el
index cf88f78..f28895b 100644
--- a/subword-mode-expansions.el
+++ b/subword-mode-expansions.el
@@ -1,6 +1,6 @@
;;; subword-mode-expansions.el --- Expansions for subword-mode to be used for
CamelCase
-;; Copyright (C) 2014 Lefteris Karapetsas
+;; Copyright (C) 2014-2020 Free Software Foundation, Inc
;; Author: Lefteris Karapetsas
;; Keywords: marking region
diff --git a/text-mode-expansions.el b/text-mode-expansions.el
index 2789b15..c26d7d4 100644
--- a/text-mode-expansions.el
+++ b/text-mode-expansions.el
@@ -1,6 +1,6 @@
;;; text-mode-expansions.el --- Expansions for expand-region to be used in text
-;; Copyright (C) 2012 Ivan Andrus
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Ivan Andrus
;; Based on js-mode-expansions by: Magnar Sveen <magn...@gmail.com>
diff --git a/the-org-mode-expansions.el b/the-org-mode-expansions.el
index 35237a2..c055486 100644
--- a/the-org-mode-expansions.el
+++ b/the-org-mode-expansions.el
@@ -1,6 +1,6 @@
;;; the-org-mode-expansions.el --- Expansions for expand-region to be used in
org-mode
-;; Copyright (C) 2012 Magnar Sveen
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Author: Magnar Sveen
;; Based on text-mode-expansions by: Ivan Andrus
diff --git a/web-mode-expansions.el b/web-mode-expansions.el
index fc099d4..0c44094 100644
--- a/web-mode-expansions.el
+++ b/web-mode-expansions.el
@@ -1,7 +1,7 @@
;;; web-mode-expansions.el --- Thin layer for adapting fxbois's
web-mode-mark-and-expand function
;;; to expand-region
-;; Copyright (C) 2012 Rotem Yaari
+;; Copyright (C) 2012-2020 Free Software Foundation, Inc
;; Authors: Rotem Yaari
;; Based on, and makes use of web-mode.el by fxbois
