diff --git a/runtime/keymap/accents.vim b/runtime/keymap/accents.vim
index fae465e933bdc7cfb7db44e53f91cdc738033e09..fed94c56561a42fc81206f77f17853e8e26d5da3 100644
--- a/runtime/keymap/accents.vim
+++ b/runtime/keymap/accents.vim
@@ -1,6 +1,6 @@
 " Vim Keymap file for latin1 accents through dead characters
 " Maintainer: Bram Moolenaar
-" Last Change: 2001 Jul 22
+" Last Change: 2006 Mar 29
 
 " All characters are given literally, conversion to another encoding (e.g.,
 " UTF-8) should work.
@@ -15,6 +15,7 @@ loadkeymap
 īA	Á
 ^A	Â
 ~A	Ã
+:A	Ä
 'C	Į
 īC	Į
 `E	Č
@@ -31,10 +32,12 @@ loadkeymap
 īO	Ó
 ^O	Ô
 ~O	Õ
+:O	Ö
 `U	Ų
 'U	Ú
 īU	Ú
 ^U	Û
+:U	Ü
 'Y	Ý
 īY	Ý
 `a	ā
@@ -42,6 +45,7 @@ loadkeymap
 īa	á
 ^a	â
 ~a	ã
+:a	ä
 'c	į
 īc	į
 `e	č
@@ -58,10 +62,12 @@ loadkeymap
 īo	ó
 ^o	ô
 ~o	õ
+:o	ö
 `u	ų
 'u	ú
 īu	ú
 ^u	û
+:u	ü
 'y	ý
 īy	ý
 ''	'
@@ -69,3 +75,4 @@ loadkeymap
 ``	`
 ^^	^
 ~~	~
+::	:
diff --git a/src/normal.c b/src/normal.c
index 3a336d5e18c7d16f7261a1448f309f6e09c40df9..57591f7ed35b87052879a396b0fe0fc6b2d179f8 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -8993,7 +8993,17 @@ nv_put(cap)
 	/* When all lines were selected and deleted do_put() leaves an empty
 	 * line that needs to be deleted now. */
 	if (empty && *ml_get(curbuf->b_ml.ml_line_count) == NUL)
+	{
 	    ml_delete(curbuf->b_ml.ml_line_count, TRUE);
+
+	    /* If the cursor was in that line, move it to the end of the last
+	     * line. */
+	    if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
+	    {
+		curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
+		coladvance((colnr_T)MAXCOL);
+	    }
+	}
 #endif
 	auto_format(FALSE, TRUE);
     }
diff --git a/src/spell.c b/src/spell.c
index 32ce2b49d239cafcf830c3fc77a53e24552a5eee..98507775313c5856e12e0782d2c69375e184b6b2 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -2039,7 +2039,7 @@ spell_move_to(wp, dir, allwords, curline, attrp)
 
     /*
      * Start looking for bad word at the start of the line, because we can't
-     * start halfway a word, we don't know where the it starts or ends.
+     * start halfway a word, we don't know where it starts or ends.
      *
      * When searching backwards, we continue in the line to find the last
      * bad word (in the cursor line: before the cursor).