diff options
| author | Juri Linkov | 2013-06-18 23:24:44 +0300 |
|---|---|---|
| committer | Juri Linkov | 2013-06-18 23:24:44 +0300 |
| commit | 0950aa27a260158ab01e434281d7ea0ee9f8d023 (patch) | |
| tree | 27e05c137176fc829cb73318fc7c18aa63f2a39f /lisp/emulation | |
| parent | 8fbcca1658ad9604616f8fa9d2223d9993007e47 (diff) | |
| download | emacs-0950aa27a260158ab01e434281d7ea0ee9f8d023.tar.gz emacs-0950aa27a260158ab01e434281d7ea0ee9f8d023.zip | |
Add explicit arg REPLACE to the callers of `shell-command-on-region'.
* lisp/simple.el (shell-command-on-region): Doc fix.
* lisp/emulation/vi.el (vi-shell-op):
* lisp/emulation/vip.el (vip-execute-com, ex-command):
* lisp/emulation/viper-cmd.el (viper-exec-bang):
* lisp/emulation/viper-ex.el (ex-command): Add non-nil arg REPLACE to
the call of `shell-command-on-region'.
* lisp/mh-e/mh-alias.el (mh-alias-local-users): Add non-nil arg REPLACE to
the call of `shell-command-on-region'.
Fixes: debbugs:14637
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/vi.el | 3 | ||||
| -rw-r--r-- | lisp/emulation/vip.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/viper-ex.el | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el index a59dd610c21..9aae40c0d00 100644 --- a/lisp/emulation/vi.el +++ b/lisp/emulation/vi.el | |||
| @@ -1148,7 +1148,8 @@ If char argument is given, it directs the output to a *temp* buffer." | |||
| 1148 | (cond ((null shell-command) | 1148 | (cond ((null shell-command) |
| 1149 | (setq shell-command (read-string "!" nil)) | 1149 | (setq shell-command (read-string "!" nil)) |
| 1150 | (setq vi-last-shell-command shell-command))) | 1150 | (setq vi-last-shell-command shell-command))) |
| 1151 | (shell-command-on-region begin end shell-command (not (vi-prefix-char-value arg))) | 1151 | (shell-command-on-region begin end shell-command (not (vi-prefix-char-value arg)) |
| 1152 | (not (vi-prefix-char-value arg))) | ||
| 1152 | t))) | 1153 | t))) |
| 1153 | 1154 | ||
| 1154 | (defun vi-shift-op (motion-command arg amount) | 1155 | (defun vi-shift-op (motion-command arg amount) |
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index ce131b854f5..b32e6e7e35d 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el | |||
| @@ -775,7 +775,7 @@ to vip-d-com for later use by vip-repeat" | |||
| 775 | (if (= com ?!) | 775 | (if (= com ?!) |
| 776 | (setq vip-last-shell-com (vip-read-string "!")) | 776 | (setq vip-last-shell-com (vip-read-string "!")) |
| 777 | vip-last-shell-com) | 777 | vip-last-shell-com) |
| 778 | t))) | 778 | t t))) |
| 779 | ((= com ?=) | 779 | ((= com ?=) |
| 780 | (save-excursion | 780 | (save-excursion |
| 781 | (set-mark vip-com-point) | 781 | (set-mark vip-com-point) |
| @@ -3042,7 +3042,7 @@ vip-s-string" | |||
| 3042 | (goto-char beg) | 3042 | (goto-char beg) |
| 3043 | (set-mark end) | 3043 | (set-mark end) |
| 3044 | (vip-enlarge-region (point) (mark)) | 3044 | (vip-enlarge-region (point) (mark)) |
| 3045 | (shell-command-on-region (point) (mark) command t)) | 3045 | (shell-command-on-region (point) (mark) command t t)) |
| 3046 | (goto-char beg))))) | 3046 | (goto-char beg))))) |
| 3047 | 3047 | ||
| 3048 | (defun ex-line-no () | 3048 | (defun ex-line-no () |
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index b2e476befd4..e7b371365e4 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el | |||
| @@ -1548,7 +1548,7 @@ as a Meta key and any number of multiple escapes are allowed." | |||
| 1548 | (car viper-shell-history) | 1548 | (car viper-shell-history) |
| 1549 | )) | 1549 | )) |
| 1550 | viper-last-shell-com) | 1550 | viper-last-shell-com) |
| 1551 | t))) | 1551 | t t))) |
| 1552 | 1552 | ||
| 1553 | (defun viper-exec-equals (m-com com) | 1553 | (defun viper-exec-equals (m-com com) |
| 1554 | (save-excursion | 1554 | (save-excursion |
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index a2bdc28d2b5..f4fcdfd1199 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el | |||
| @@ -2176,7 +2176,7 @@ Please contact your system administrator. " | |||
| 2176 | (goto-char beg) | 2176 | (goto-char beg) |
| 2177 | (set-mark end) | 2177 | (set-mark end) |
| 2178 | (viper-enlarge-region (point) (mark t)) | 2178 | (viper-enlarge-region (point) (mark t)) |
| 2179 | (shell-command-on-region (point) (mark t) command t)) | 2179 | (shell-command-on-region (point) (mark t) command t t)) |
| 2180 | (goto-char beg))))) | 2180 | (goto-char beg))))) |
| 2181 | 2181 | ||
| 2182 | (defun ex-compile () | 2182 | (defun ex-compile () |