[Emacs-diffs] Changes to emacs/lisp/simple.el

[Richard M. Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.518 emacs/lisp/simple.el:1.519
*** emacs/lisp/simple.el:1.518  Sat Jan 12 23:01:11 2002
--- emacs/lisp/simple.el        Thu Jan 31 23:20:02 2002
***************
*** 1421,1433 ****
  If it is nil, error output is mingled with regular output.
  In an interactive call, the variable `shell-command-default-error-buffer'
  specifies the value of ERROR-BUFFER."
!   (interactive (let ((string
!                     ;; Do this before calling region-beginning
!                     ;; and region-end, in case subprocess output
!                     ;; relocates them while we are in the minibuffer.
!                     (read-from-minibuffer "Shell command on region: "
!                                           nil nil nil
!                                           'shell-command-history)))
                 ;; call-interactively recognizes region-beginning and
                 ;; region-end specially, leaving them in the history.
                 (list (region-beginning) (region-end)
--- 1421,1435 ----
  If it is nil, error output is mingled with regular output.
  In an interactive call, the variable `shell-command-default-error-buffer'
  specifies the value of ERROR-BUFFER."
!   (interactive (let (string)
!                (unless (mark)
!                  (error "The mark is not set now, so there is no region"))
!                ;; Do this before calling region-beginning
!                ;; and region-end, in case subprocess output
!                ;; relocates them while we are in the minibuffer.
!                (setq string (read-from-minibuffer "Shell command on region: "
!                                                   nil nil nil
!                                                   'shell-command-history))
                 ;; call-interactively recognizes region-beginning and
                 ;; region-end specially, leaving them in the history.
                 (list (region-beginning) (region-end)