Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

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."
       (cond ((null shell-command)
              (setq shell-command (read-string "!" nil))
              (setq vi-last-shell-command shell-command)))
-      (shell-command-on-region begin end shell-command (not (vi-prefix-char-value arg)))
+      (shell-command-on-region begin end shell-command (not (vi-prefix-char-value arg))
+                                                       (not (vi-prefix-char-value arg)))
       t)))
 
 (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"
                   (if (= com ?!)
                       (setq vip-last-shell-com (vip-read-string "!"))
                     vip-last-shell-com)
-                  t)))
+                  t t)))
               ((= com ?=)
                (save-excursion
                  (set-mark vip-com-point)
@@ -3042,7 +3042,7 @@ vip-s-string"
           (goto-char beg)
           (set-mark end)
           (vip-enlarge-region (point) (mark))
-          (shell-command-on-region (point) (mark) command t))
+          (shell-command-on-region (point) (mark) command t t))
         (goto-char beg)))))
 
 (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."
                 (car viper-shell-history)
                 ))
        viper-last-shell-com)
-     t)))
+     t t)))
 
 (defun viper-exec-equals (m-com com)
   (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. "
           (goto-char beg)
           (set-mark end)
           (viper-enlarge-region (point) (mark t))
-          (shell-command-on-region (point) (mark t) command t))
+          (shell-command-on-region (point) (mark t) command t t))
         (goto-char beg)))))
 
 (defun ex-compile ()