kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* misc/ruby-electric.el (ruby-electric-delete-backward-char):

Browse source 
Introduce electric DEL that deletes what the previous electric
  command has input.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2013-05-18 17:38:04 +00:00
parent 30034b5536
commit 616084fd97
2 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,4 +1,8 @@
Sun May 19 02:27:21 2013 Akinori MUSHA <knu@iDaemons.org> Sun May 19 02:30:00 2013 Akinori MUSHA <knu@iDaemons.org>
* misc/ruby-electric.el (ruby-electric-delete-backward-char):
Introduce electric DEL that deletes what the previous electric
command has input.
* misc/ruby-electric.el (ruby-electric-matching-char): Make * misc/ruby-electric.el (ruby-electric-matching-char): Make
electric quotes work again at the end of buffer. electric quotes work again at the end of buffer.

31
misc/ruby-electric.el
View file

@ -124,7 +124,8 @@ strings. Note that you must have Font Lock enabled."
(define-key ruby-mode-map ")" 'ruby-electric-closing-char) (define-key ruby-mode-map ")" 'ruby-electric-closing-char)
(define-key ruby-mode-map "]" 'ruby-electric-closing-char) (define-key ruby-mode-map "]" 'ruby-electric-closing-char)
(define-key ruby-mode-map "|" 'ruby-electric-bar) (define-key ruby-mode-map "|" 'ruby-electric-bar)
(define-key ruby-mode-map "#" 'ruby-electric-hash)) (define-key ruby-mode-map "#" 'ruby-electric-hash)
(define-key ruby-mode-map (kbd "DEL") 'ruby-electric-delete-backward-char))
(defun ruby-electric-space (arg) (defun ruby-electric-space (arg)
(interactive "P") (interactive "P")
@ -184,6 +185,11 @@ strings. Note that you must have Font Lock enabled."
(setq this-command 'cua-replace-region) (setq this-command 'cua-replace-region)
(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))
(defmacro ruby-electric-insert (arg &rest body) (defmacro ruby-electric-insert (arg &rest body)
`(cond ((ruby-electric-cua-replace-region-p) `(cond ((ruby-electric-cua-replace-region-p)
(ruby-electric-cua-replace-region)) (ruby-electric-cua-replace-region))
@ -312,5 +318,28 @@ strings. Note that you must have Font Lock enabled."
(save-excursion (save-excursion
(insert "|"))))) (insert "|")))))
(defun ruby-electric-delete-backward-char(arg)
(interactive "P")
(if (ruby-electric-cua-replace-region-p)
(ruby-electric-cua-delete-region)
(cond ((memq last-command '(ruby-electric-matching-char
ruby-electric-bar))
(delete-char 1))
((eq last-command 'ruby-electric-curlies)
(cond ((eolp)
(cond ((char-equal (preceding-char) ?\s)
(setq this-command last-command))
((char-equal (preceding-char) ?{)
(and (looking-at "[ \t\n]*}")
(delete-char (- (match-end 0) (match-beginning 0)))))))
((char-equal (following-char) ?\s)
(setq this-command last-command)
(delete-char 1))
((char-equal (following-char) ?})
(delete-char 1))))
((eq last-command 'ruby-electric-hash)
(and (char-equal (preceding-char) ?{)
(delete-char 1))))
(delete-backward-char 1)))
(provide 'ruby-electric) (provide 'ruby-electric)