X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=spray.el;h=8f25a9328fdd9209f1b3c5360181022987afc123;hb=85cc75a5f67c77acdea38c0d23ddf1cf4d83f19b;hp=4155926b6f1a55e89824d782cfc363e08f6af2ab;hpb=2161f109b711d6ec7d3b7f54c22ffaa65bd29270;p=spray

diff --git a/spray.el b/spray.el
index 4155926..8f25a93 100644
--- a/spray.el
+++ b/spray.el
@@ -91,6 +91,7 @@
 (defvar spray--saved-cursor-type nil)
 (defvar spray--saved-buffer-face nil)
 (defvar spray--saved-restriction nil)
+(defvar spray--saved-smartparens-enabled nil)
 
 ;; * utility functions
 
@@ -115,7 +116,15 @@
                                              (cons (point-min) (point-max)))
                spray--saved-buffer-face (and (boundp 'buffer-face-mode)
                                              buffer-face-mode
-                                             buffer-face-mode-face))
+                                             buffer-face-mode-face)
+               spray--saved-smartparens-enabled (and (boundp 'smartparens-mode)
+                                                     smartparens-mode)
+               spray--saved-highlight-symbol-enabled (and (boundp 'highlight-symbol-mode)
+                                                     highlight-symbol-mode))
+         ;; smartparens wrapping of all letter binds can cause problems.
+         ;; for example, it can cause auto-complete to activate
+         (and spray--saved-smartparens-enabled (smartparens-mode -1))
+         (and spray--saved-highlight-symbol-enabled (highlight-symbol-mode -1))
          (setq cursor-type nil)
          (let ((buffer-face-mode-face `(:height ,spray-height)))
            (buffer-face-mode 1))
@@ -125,6 +134,8 @@
          (overlay-put spray--accent-overlay 'face 'spray-accent-face)
          (spray-start))
         (t
+         (and spray--saved-smartparens-enabled (smartparens-mode 1))
+         (and spray--saved-highlight-symbol-enabled (highlight-symbol-mode 1))
          (setq cursor-type spray--saved-cursor-type)
          (if spray--saved-restriction
              (narrow-to-region (car spray--saved-restriction)