Merge branch 'release/0.8.0'

.travis.yml

@@ -1,20 +1,14 @@
 language: emacs-lisp
 before_install:
-  - curl -fsSkL https://gist.githubusercontent.com/rejeep/7736123/raw | sh
-  - export PATH="/home/travis/.cask/bin:$PATH"
-  - export PATH="/home/travis/.evm/bin:$PATH"
-  - evm install $EVM_EMACS --use
-  - cask
+  - git clone https://github.com/rejeep/evm.git $HOME/.evm
+  - export PATH=$HOME/.cask/bin:$HOME/.evm/bin:$PATH
+  - evm config path /tmp
+  - evm install $EVM_EMACS --use --skip
+  - curl -fsSkL https://raw.github.com/cask/cask/master/go | python
 env:
-  - EVM_EMACS=emacs-24.1-bin
-  - EVM_EMACS=emacs-24.2-bin
-  - EVM_EMACS=emacs-24.4-bin
-  - EVM_EMACS=emacs-24.5-bin
+  - EVM_EMACS=emacs-25.3-travis
+  - EVM_EMACS=emacs-26.3-travis-linux-xenial
+  - EVM_EMACS=emacs-git-snapshot-travis-linux-xenial
 script:
   - emacs --version
   - make test
-notifications:
-  webhooks: https://webhooks.gitter.im/e/fa0500ce49cab8dc8144
-  on_success: change
-  on_failure: always
-  on_start: never

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

COPYING

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.

Cask

@@ -1,3 +1,3 @@
 (package-file "drupal-mode.el")
 
-(source marmalade)
+(source melpa)

Makefile

@@ -1,6 +1,6 @@
 # This file is part of Drupal mode.
 
-# Copyright (C) 2012, 2013 Arne Jørgensen
+# Copyright (C) 2012, 2013, 2020 Arne Jørgensen
 
 # Author: Arne Jørgensen <[email protected]>
 
@@ -15,7 +15,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with Drupal mode.  If not, see <http://www.gnu.org/licenses/>.
+# along with Drupal mode.  If not, see <https://www.gnu.org/licenses/>.
 
 .PHONY: all test clean install
 
@@ -42,9 +42,9 @@ README: README.md
 	$(PANDOC) -t plain -o $@ $^
 
 $(ARCHIVE_NAME)-pkg.el: $(ARCHIVE_NAME).el
-	$(CASK) package
+	$(CASK) pkg-file
 
-# create a tar ball in package.el format for uploading to http://marmalade-repo.org
+# create a tar ball in package.el format
 $(PACKAGE_NAME).tar: README $(ARCHIVE_NAME).el $(ARCHIVE_NAME)-pkg.el $(ARCHIVE_NAME).info dir drupal/*.el drupal-tests.el drush-make-mode.el
 	$(TAR) -c -s "@^@$(PACKAGE_NAME)/@" -f $(PACKAGE_NAME).tar $^
 

README.md

@@ -32,29 +32,25 @@ below) and depend on a few through the packaging system
 ## Installation
 
 The easiest way to install Drupal mode is probably to install it via
-the ELPA archive at
-[Marmalade](http://marmalade-repo.org/packages/drupal-mode) or
-[MELPA Stable](http://stable.melpa.org/#/drupal-mode) (if you want
-bleeding edge use regular [MELPA](http://melpa.org/#/drupal-mode)).
-
-ELPA (package.el) is part of Emacs 24. For Emacs 23 see
-[Marmalade](http://marmalade-repo.org) for installation instructions.
+the ELPA archive [MELPA
+Stable](https://stable.melpa.org/#/drupal-mode) (if you want bleeding
+edge use regular [MELPA](https://melpa.org/#/drupal-mode)).
 
 
 ## Features of Drupal mode
 
 ### Drupal Coding Standards
 
 Drupal mode will make you write code that adheres to
-[Drupals coding standards](http://drupal.org/coding-standards#indenting).
+[Drupals coding standards](https://www.drupal.org/coding-standards).
 
 It does this by:
 
 
 #### Indentation
 
 In php-mode code will be indented according to
-[Drupals coding standards](http://drupal.org/coding-standards#indenting). If not
+[Drupals coding standards](https://www.drupal.org/coding-standards). If not
 it is considered a bug!
 
 
@@ -91,10 +87,10 @@ menu entry.
 
 Files that are part of a Drupal project will try to identify the used
 version of Drupal core and look up the documentation for the
-corresponding version at http://api.drupal.org.
+corresponding version at https://api.drupal.org.
 
 If the symbol at point is believed to be a Drush command the
-documentation will be looked up at http://api.drush.org instead. If
+documentation will be looked up at https://api.drush.org instead. If
 Drush is installed it will identify the version of Drush and look up
 the documentation for the installed version of Drush.
 
@@ -131,15 +127,15 @@ Etags is a built-in part of Emacs.
 
 ### GNU Globals / gtags
 
-If you load [GNU Globals / gtags](http://www.gnu.org/software/global/)
+If you load [GNU Globals / gtags](https://www.gnu.org/software/global/)
 support in Emacs then Drupal mode will set `gtags-rootdir` to your
 DRUPAL_ROOT.
 
 
 ### Drush utilities for Emacs users
 
 If
-[Drush utilities for Emacs users](http://drupal.org/project/emacs_drush)
+[Drush utilities for Emacs users](https://www.drupal.org/project/emacs_drush)
 is installed Drupal mode will update existing tag files in your
 DRUPAL_ROOT after saving a buffer.
 
@@ -148,11 +144,11 @@ DRUPAL_ROOT after saving a buffer.
 
 If ispell.el is loaded in Emacs then Drupal mode will set the language
 of your Drupal mode buffers to `american` as stated in [Drupals coding
-standards](http://drupal.org/coding-standards).
+standards](https://www.drupal.org/coding-standards).
 
 ispell.el is a built-in part of Emacs. An external program must be
 installed to run the actual spell checking,
-i.e. [ispell](http://www.gnu.org/software/ispell/),
+i.e. [ispell](https://www.gnu.org/software/ispell/),
 [aspell](http://aspell.net/), or
 [hunspell](http://hunspell.sourceforge.net/).
 
@@ -162,14 +158,14 @@ i.e. [ispell](http://www.gnu.org/software/ispell/),
 If support for
 [flymake-phpcs.el](https://github.com/illusori/emacs-flymake-phpcs) is
 loaded in Emacs and you have installed
-[Drupal Code Sniffer](http://drupal.org/project/drupalcs) rules then
+[Drupal Code Sniffer](https://www.drupal.org/project/drupalcs) rules then
 Drupal mode will enable flymake-phpcs under php-mode.
 
 For this to work you need:
 
-*    [PHP CodeSniffer](http://pear.php.net/package/PHP_CodeSniffer)
-*    [flymake-phpcs.el](http://marmalade-repo.org/packages/flymake-phpcs)
-*    [Drupal Code Sniffer](http://drupal.org/project/drupalcs) rules
+*    [PHP CodeSniffer](https://pear.php.net/package/PHP_CodeSniffer)
+*    [flymake-phpcs.el](https://melpa.org/#/flymake-phpcs)
+*    [Drupal Code Sniffer](https://www.drupal.org/project/drupalcs) rules
 
 
 ## Other takes on a Drupal mode
@@ -179,11 +175,11 @@ wild:
 
 *    [Search Github for drupal-mode](https://github.com/search?l=Emacs+Lisp&q=drupal&type=Repositories)
 *     At drupal.org:
-	* http://drupal.org/sandbox/bartlantz/1405156
-	* http://drupal.org/project/emacs
+	* https://www.drupal.org/sandbox/bartlantz/1405156
+	* https://www.drupal.org/project/emacs
 
 All of them more or less based on
-[Configuring Emacs](http://drupal.org/node/59868).
+[Configuring Emacs](https://www.drupal.org/node/59868).
 
 
 ## Development of Drupal mode

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+All versions are supported.
+
+## Reporting a Vulnerability
+
+Security issues can be reported to [Arne Jørgensen](https://github.com/arnested)
+either by [mail](mailto:[email protected]) or any other channel you prefer and
+trust (see my [Keybase profile](https://keybase.io/arnested)).