From e59f453e880d5a9e400785122f30fc504a622c33 Mon Sep 17 00:00:00 2001 From: knu Date: Thu, 26 Sep 2013 12:16:22 +0000 Subject: [PATCH] * misc/ruby-electric.el (ruby-electric-delete-backward-char): Add support for smartparen-mode. * misc/ruby-electric.el (ruby-electric-cua-replace-region-maybe) (ruby-electric-cua-delete-region-maybe): New functions that combine `ruby-electric-cua-*-region` with `ruby-electric-cua-*-region-p`, using a slightly better way to detect if it is in cua-mode. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 +++++++++++ misc/ruby-electric.el | 33 ++++++++++++++++----------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b0d3a60e2..e2cdc3782b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu Sep 26 21:07:49 2013 Akinori MUSHA + + * misc/ruby-electric.el (ruby-electric-delete-backward-char): Add + support for smartparen-mode. + + * misc/ruby-electric.el (ruby-electric-cua-replace-region-maybe) + (ruby-electric-cua-delete-region-maybe): New functions that + combine `ruby-electric-cua-*-region` with + `ruby-electric-cua-*-region-p`, using a slightly better way to + detect if it is in cua-mode. + Thu Sep 26 16:51:00 2013 Shota Fukumori * insns.def (opt_regexpmatch2): Check String#=~ hasn't overridden diff --git a/misc/ruby-electric.el b/misc/ruby-electric.el index 04eb1494dc..b1812bcb15 100644 --- a/misc/ruby-electric.el +++ b/misc/ruby-electric.el @@ -179,22 +179,23 @@ strings. Note that you must have Font Lock enabled." (beginning-of-line) (looking-at ruby-electric-single-keyword-in-line-re)))))))) -(defun ruby-electric-cua-replace-region-p() - (eq (key-binding "a") 'cua-replace-region)) +(defun ruby-electric-cua-replace-region-maybe() + (let ((func (key-binding [remap self-insert-command]))) + (when (memq func '(cua-replace-region + sp--cua-replace-region)) + (setq this-original-command 'self-insert-command) + (funcall (setq this-command func)) + t))) -(defun ruby-electric-cua-replace-region() - (setq this-original-command 'self-insert-command) - (setq this-command 'cua-replace-region) - (cua-replace-region)) - -(defun ruby-electric-cua-delete-region() - (setq this-original-command 'delete-backward-char) - (setq this-command 'cua-delete-region) - (cua-delete-region)) +(defun ruby-electric-cua-delete-region-maybe() + (let ((func (key-binding [remap delete-backward-char]))) + (when (eq func 'cua-delete-region) + (setq this-original-command 'delete-backward-char) + (funcall (setq this-command func)) + t))) (defmacro ruby-electric-insert (arg &rest body) - `(cond ((ruby-electric-cua-replace-region-p) - (ruby-electric-cua-replace-region)) + `(cond ((ruby-electric-cua-replace-region-maybe)) ((and (null ,arg) (ruby-electric-is-last-command-char-expandable-punct-p)) @@ -290,8 +291,7 @@ strings. Note that you must have Font Lock enabled." (defun ruby-electric-closing-char(arg) (interactive "P") (cond - ((ruby-electric-cua-replace-region-p) - (ruby-electric-cua-replace-region)) + ((ruby-electric-cua-replace-region-maybe)) (arg (setq this-command 'self-insert-command) (insert (make-string (prefix-numeric-value arg) last-command-event))) @@ -322,8 +322,7 @@ strings. Note that you must have Font Lock enabled." (defun ruby-electric-delete-backward-char(arg) (interactive "P") - (if (ruby-electric-cua-replace-region-p) - (ruby-electric-cua-delete-region) + (unless (ruby-electric-cua-delete-region-maybe) (cond ((memq last-command '(ruby-electric-matching-char ruby-electric-bar)) (delete-char 1))