aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-07-02 10:09:36 -0400
committerChong Yidong2010-07-02 10:09:36 -0400
commit23640f8fadea5c830fa356cea7bea88ffc045bde (patch)
tree0f695975ce206762357ba6f44c8db0d82b106668
parent4f15a3709165621d5628ff3aae927e0bbb1c42cf (diff)
downloademacs-23640f8fadea5c830fa356cea7bea88ffc045bde.tar.gz
emacs-23640f8fadea5c830fa356cea7bea88ffc045bde.zip
Replace delete-backward-char Lisp calls in Viper (Bug#6552).
* emulation/viper-cmd.el (viper-delete-backward-char) (viper-del-backward-char-in-insert) (viper-del-backward-char-in-replace, viper-change) (viper-backward-indent): Replace delete-backward-char with delete-char (Bug#6552).
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/emulation/viper-cmd.el12
2 files changed, 14 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea4ac607970..90d1260b998 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12010-07-02 Chong Yidong <cyd@stupidchicken.com>
2
3 * emulation/viper-cmd.el (viper-delete-backward-char)
4 (viper-del-backward-char-in-insert)
5 (viper-del-backward-char-in-replace, viper-change)
6 (viper-backward-indent): Replace delete-backward-char with
7 delete-char (Bug#6552).
8
12010-07-01 Chong Yidong <cyd@stupidchicken.com> 92010-07-01 Chong Yidong <cyd@stupidchicken.com>
2 10
3 * ruler-mode.el (ruler--save-header-line-format): Fix typos. 11 * ruler-mode.el (ruler--save-header-line-format): Fix typos.
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 8c216d9aca6..602b442a045 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -4247,7 +4247,7 @@ Null string will repeat previous search."
4247 (setq viper-use-register nil))) 4247 (setq viper-use-register nil)))
4248 (if (and (bolp) viper-ex-style-editing) 4248 (if (and (bolp) viper-ex-style-editing)
4249 (ding)) 4249 (ding))
4250 (delete-backward-char val t))) 4250 (delete-char (- val) t)))
4251 4251
4252 4252
4253(defun viper-del-backward-char-in-insert () 4253(defun viper-del-backward-char-in-insert ()
@@ -4256,7 +4256,7 @@ Null string will repeat previous search."
4256 (if (and viper-ex-style-editing (bolp)) 4256 (if (and viper-ex-style-editing (bolp))
4257 (beep 1) 4257 (beep 1)
4258 ;; don't put on kill ring 4258 ;; don't put on kill ring
4259 (delete-backward-char 1 nil))) 4259 (delete-char -1 nil)))
4260 4260
4261 4261
4262(defun viper-del-backward-char-in-replace () 4262(defun viper-del-backward-char-in-replace ()
@@ -4269,14 +4269,14 @@ cursor move past the beginning of line."
4269 (cond (viper-delete-backwards-in-replace 4269 (cond (viper-delete-backwards-in-replace
4270 (cond ((not (bolp)) 4270 (cond ((not (bolp))
4271 ;; don't put on kill ring 4271 ;; don't put on kill ring
4272 (delete-backward-char 1 nil)) 4272 (delete-char -1 nil))
4273 (viper-ex-style-editing 4273 (viper-ex-style-editing
4274 (beep 1)) 4274 (beep 1))
4275 ((bobp) 4275 ((bobp)
4276 (beep 1)) 4276 (beep 1))
4277 (t 4277 (t
4278 ;; don't put on kill ring 4278 ;; don't put on kill ring
4279 (delete-backward-char 1 nil)))) 4279 (delete-char -1 nil))))
4280 (viper-ex-style-editing 4280 (viper-ex-style-editing
4281 (if (bolp) 4281 (if (bolp)
4282 (beep 1) 4282 (beep 1)
@@ -4344,7 +4344,7 @@ cursor move past the beginning of line."
4344 (insert-before-markers "@") ; put placeholder after the TAB 4344 (insert-before-markers "@") ; put placeholder after the TAB
4345 (untabify (viper-replace-start) (point)) 4345 (untabify (viper-replace-start) (point))
4346 ;; del @, don't put on kill ring 4346 ;; del @, don't put on kill ring
4347 (delete-backward-char 1) 4347 (delete-char -1)
4348 4348
4349 (viper-set-replace-overlay-glyphs 4349 (viper-set-replace-overlay-glyphs
4350 viper-replace-region-start-delimiter 4350 viper-replace-region-start-delimiter
@@ -4622,7 +4622,7 @@ One can use `` and '' to temporarily jump 1 step back."
4622 (progn 4622 (progn
4623 (if (eq ?^ (preceding-char)) 4623 (if (eq ?^ (preceding-char))
4624 (setq viper-preserve-indent t)) 4624 (setq viper-preserve-indent t))
4625 (delete-backward-char 1) 4625 (delete-char -1)
4626 (setq p (point)) 4626 (setq p (point))
4627 (setq indent nil))) 4627 (setq indent nil)))
4628 (save-excursion 4628 (save-excursion