(kill-region): Set this-command unconditionally in a read-only buffer.

diff --git a/lisp/simple.el b/lisp/simple.el
index 9e79a1148912da348aec11393ef815e4869ddea0..ae4ce3911101d0cff992077413e7ccfcab3f647b 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1647,10 +1647,11 @@ to make one entry in the kill ring."
      ;; However, there's no harm in putting
      ;; the region's text in the kill ring, anyway.
      (copy-region-as-kill beg end)
-     ;; This should always barf, and give us the correct error.
+     ;; Set this-command now, so it will be set even if we get an error.
+     (setq this-command 'kill-region)
+     ;; This should barf, if appropriate, and give us the correct error.
      (if kill-read-only-ok
         (message "Read only text copied to kill ring")
-       (setq this-command 'kill-region)
        ;; Signal an error if the buffer is read-only.
        (barf-if-buffer-read-only)
        ;; If the buffer isn't read-only, the text is.