Merge pull request #4 from syl20bnr/master

[spray] / spray.el

diff --git a/spray.el b/spray.el
index 5ce76ebe66704ffa66a7ad27b832cbf72b4b200d..8fa8bce4ddfacf51be450481aabb8360936638c3 100644 (file)
--- a/spray.el
+++ b/spray.el
@@ -4,17 +4,16 @@
 
 ;; 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
-;; the Free Software Foundation; either version 2 of the License, or
+;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
-;;
+
 ;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; 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, write to the Free Software
-;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; Maintainer: Ian Kelling <ian@iankelling.org>
 ;; Author: Ian Kelling <ian@iankelling.org>
@@ -22,6 +21,7 @@
 ;; Created: 18 Jun 2014
 ;; Version: 0.0.2
 ;; URL: https://github.com/ian-kelling/spray
+;; Mailing list: https://lists.iankelling.org/listinfo/spray
 ;; Keywords: convenience
 
 ;;; Commentary:
@@ -124,7 +124,8 @@ decreasing by one for each subsequent word."
   :type 'integer)
 
 (defcustom spray-unsupported-minor-modes
-  '(buffer-face-mode smartparens-mode highlight-symbol-mode)
+  '(buffer-face-mode smartparens-mode highlight-symbol-mode
+                    column-number-mode)
   "Minor modes to toggle off when in spray mode."
   :group 'spray
   :type '(list symbol))
@@ -137,7 +138,7 @@ decreasing by one for each subsequent word."
   "Face for non-accent characters."
   :group 'spray)
 
-(defface spray-base-face
+(defface spray-accent-face
   '((t (:foreground "red" :inherit spray-base-face)))
   "Face for accent character."
   :group 'spray)
@@ -269,7 +270,7 @@ decreasing by one for each subsequent word."
         (t
          (widen)
          (if (eobp)
-             (spray-mode -1)
+             (spray-quit)
            (when (not (zerop spray--first-words))
              (setq spray--initial-delay spray--first-words)
              (setq spray--first-words (1- spray--first-words)))