iankelling.org
/
git
/
spray
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2161f10
)
fix smartparen integration bug
author
Ian Kelling
<ian@iankelling.org>
Wed, 2 Jul 2014 00:26:01 +0000
(17:26 -0700)
committer
Ian Kelling
<ian@iankelling.org>
Wed, 2 Jul 2014 00:26:01 +0000
(17:26 -0700)
spray.el
patch
|
blob
|
history
diff --git
a/spray.el
b/spray.el
index 4155926b6f1a55e89824d782cfc363e08f6af2ab..afefae2541f06ae66cc38f2af4e5da1e9967c3f9 100644
(file)
--- 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-cursor-type nil)
(defvar spray--saved-buffer-face nil)
(defvar spray--saved-restriction nil)
+(defvar spray--saved-smartparens-enabled nil)
;; * utility functions
;; * utility functions
@@
-115,7
+116,12
@@
(cons (point-min) (point-max)))
spray--saved-buffer-face (and (boundp 'buffer-face-mode)
buffer-face-mode
(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))
+ ;; 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))
(setq cursor-type nil)
(let ((buffer-face-mode-face `(:height ,spray-height)))
(buffer-face-mode 1))
(setq cursor-type nil)
(let ((buffer-face-mode-face `(:height ,spray-height)))
(buffer-face-mode 1))
@@
-125,6
+131,7
@@
(overlay-put spray--accent-overlay 'face 'spray-accent-face)
(spray-start))
(t
(overlay-put spray--accent-overlay 'face 'spray-accent-face)
(spray-start))
(t
+ (and spray--saved-smartparens-enabled (smartparens-mode 1))
(setq cursor-type spray--saved-cursor-type)
(if spray--saved-restriction
(narrow-to-region (car spray--saved-restriction)
(setq cursor-type spray--saved-cursor-type)
(if spray--saved-restriction
(narrow-to-region (car spray--saved-restriction)