summaryrefslogtreecommitdiff
path: root/.emacs.d/lisp/yasnippet.el
diff options
context:
space:
mode:
authorSimeon Simeonov2016-03-03 10:45:20 +0100
committerSimeon Simeonov2016-03-03 10:45:20 +0100
commita6a2922c75fa06fb2496d2ba59520a121205fd26 (patch)
tree88216e56eef5574249eb7debdfadf4cf494d3947 /.emacs.d/lisp/yasnippet.el
parent481decd28b7940d1dae11fd0ff2dc06143c46ee8 (diff)
Handle .ino files with c++-mode. Upgrade yasnippet and yaml.
Diffstat (limited to '.emacs.d/lisp/yasnippet.el')
-rw-r--r--.emacs.d/lisp/yasnippet.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/.emacs.d/lisp/yasnippet.el b/.emacs.d/lisp/yasnippet.el
index 69d6b26..b68389f 100644
--- a/.emacs.d/lisp/yasnippet.el
+++ b/.emacs.d/lisp/yasnippet.el
@@ -3390,9 +3390,9 @@ BEG, END and LENGTH like overlay modification hooks."
3390 (= (point) (yas--field-start field)) 3390 (= (point) (yas--field-start field))
3391 (require 'delsel) 3391 (require 'delsel)
3392 ;; `yank' sets `this-command' to t during execution. 3392 ;; `yank' sets `this-command' to t during execution.
3393 (let ((clearp (get (if (commandp this-command) this-command 3393 (let* ((command (if (commandp this-command) this-command
3394 this-original-command) 3394 this-original-command))
3395 'delete-selection))) 3395 (clearp (if (symbolp command) (get command 'delete-selection))))
3396 (when (and (not (memq clearp '(yank supersede kill))) 3396 (when (and (not (memq clearp '(yank supersede kill)))
3397 (functionp clearp)) 3397 (functionp clearp))
3398 (setq clearp (funcall clearp))) 3398 (setq clearp (funcall clearp)))