3 files changed, 13 insertions, 5 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index a4d873a543d..a0eb147d9c8 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1650,9 +1650,15 @@ quit          spell session exited."
 					     cursor-location))
 		    (if (not (equal new-word (car poss)))
 			(progn
-			  (delete-region start end)
-			  (setq start (point))
+			  (goto-char start)
+			  ;; Insert first and then delete,
+			  ;; to avoid collapsing markers before and after
+			  ;; into a single place.
 			  (ispell-insert-word new-word)
+			  (delete-region (point) (+ (point) (- end start)))
+			  ;; It is meaningless to preserve the cursor position
+			  ;; inside a word that has changed.
+			  (setq cursor-location (point))
 			  (setq end (point))))
 		    (if (not (atom replace)) ;recheck spelling of replacement
 			(progn
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index eac1cb94105..701095caa8e 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -42,7 +42,7 @@ Contains canonical charset names that don't correspond to coding systems.")
 
 (defun po-find-charset (filename)
   "Return PO charset value for FILENAME.
-If FILENAME is a cons, the cdr part is a buffer that already contains
+If FILENAME is a cons cell, its CDR is a buffer that already contains
 the PO file (but not yet decoded)."
   (let ((charset-regexp
 	 "^\"Content-Type:[ \t]*text/plain;[ \t]*charset=\\(.*\\)\\\\n\"")
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index dab08902769..002ab9dac11 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -6,7 +6,7 @@
 ;; Keywords: wp, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
 ;; Created: Sat Jul 08 2000 13:28:45 (PST)
-;; Revised: Tue May 30 2006 10:01:43 (PDT)
+;; Revised: Thu Jul 20 2006 17:30:09 (PDT)
 
 ;; This file is part of GNU Emacs.
 
@@ -1394,7 +1394,9 @@ the last cache point coordinate."
      (setq table-command-remap-alist
 	   (cons (cons command func-symbol)
 		 table-command-remap-alist))))
- '(beginning-of-line
+ '(move-beginning-of-line
+   beginning-of-line
+   move-end-of-line
    end-of-line
    beginning-of-buffer
    end-of-buffer