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

[Richard M. Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.521 emacs/lisp/simple.el:1.522
*** emacs/lisp/simple.el:1.521  Fri Feb 15 03:53:15 2002
--- emacs/lisp/simple.el        Wed Feb 20 17:33:01 2002
***************
*** 1482,1495 ****
                    (with-current-buffer buffer
                      (save-excursion
                        (goto-char (point-max))
!                       (insert "...Shell command failed"))))
                (display-message-or-buffer buffer))
            ;; No output; error?
!           (message (if (and error-file
!                             (< 0 (nth 7 (file-attributes error-file))))
!                        "(Shell command %sed with some error output)"
!                      "(Shell command %sed with no output)")
!                    (if (equal 0 exit-status) "succeed" "fail"))
            ;; Don't kill: there might be useful info in the undo-log.
            ;; (kill-buffer buffer)
            ))))
--- 1482,1501 ----
                    (with-current-buffer buffer
                      (save-excursion
                        (goto-char (point-max))
!                       (insert (format "...Shell command failed with code %d"
!                                       exit-status)))))
                (display-message-or-buffer buffer))
            ;; No output; error?
!           (let ((output
!                  (if (and error-file
!                           (< 0 (nth 7 (file-attributes error-file))))
!                      "some error output"
!                    "no output")))
!             (if (equal 0 exit-status)
!                 (message "(Shell command succeeded with %s)"
!                          output)
!               (message "(Shell command failed with code %d and %s)"
!                        exit-status output)))
            ;; Don't kill: there might be useful info in the undo-log.
            ;; (kill-buffer buffer)
            ))))
***************
*** 1927,1933 ****
                           ((eq arg '-) -1)
                           (t (1- arg)))))
      (let ((inhibit-read-only t))
!       (remove-text-properties opoint (point) '(read-only nil))))
    (if (consp arg)
        ;; This is like exchange-point-and-mark, but doesn't activate the mark.
        ;; It is cleaner to avoid activation, even though the command
--- 1933,1941 ----
                           ((eq arg '-) -1)
                           (t (1- arg)))))
      (let ((inhibit-read-only t))
!       ;; Clear `field' property for the sake of copying from the
!       ;; minibuffer prompt or a *shell* prompt.
!       (remove-text-properties opoint (point) '(read-only nil field nil))))
    (if (consp arg)
        ;; This is like exchange-point-and-mark, but doesn't activate the mark.
        ;; It is cleaner to avoid activation, even though the command