# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 717849091 0
# Node ID 6b63876aea1ceabdac6f63300758802dd0022cb5
# Parent  68f025a5fdaae51d33616f1fa0a090108e69f812
(kill-word): Don't change point before calling kill-region.
(delete-indentation): Don't go beyond eob, comparing with fill-prefix.

diff -r 68f025a5fdaa -r 6b63876aea1c lisp/simple.el
--- a/lisp/simple.el	Wed Sep 30 08:36:57 1992 +0000
+++ b/lisp/simple.el	Wed Sep 30 10:31:31 1992 +0000
@@ -69,6 +69,7 @@
 	;; If the second line started with the fill prefix,
 	;; delete the prefix.
 	(if (and fill-prefix
+		 (<= (+ (point) (length fill-prefix)) (point-max))
 		 (string= fill-prefix
 			  (buffer-substring (point)
 					    (+ (point) (length fill-prefix)))))
@@ -1570,7 +1571,7 @@
   "Kill characters forward until encountering the end of a word.
 With argument, do this that many times."
   (interactive "p")
-  (kill-region (point) (progn (forward-word arg) (point))))
+  (kill-region (point) (save-excursion (forward-word arg) (point))))
 
 (defun backward-kill-word (arg)
   "Kill characters backward until encountering the end of a word.