Fix minor bug.

lisp/ChangeLog

@@ -3,6 +3,7 @@
 	* org.el (org-hide-archived-subtrees): Don't jump to end of
 	subtree if the match was not in a headline.
 	(org-inside-latex-macro-p): Allow more complex arguments.
+	(org-emphasize): Protect against use at end of buffer.
 
 2010-02-15  Carsten Dominik  <carsten.dominik@gmail.com>
 

lisp/org.el

@@ -4557,8 +4557,9 @@ will be prompted for."
 		(string-match (concat "[" (nth 0 erc) "\n]")
 			      (char-to-string (char-before (point)))))
       (insert " "))
-    (unless (string-match (concat "[" (nth 1 erc) "\n]")
-			  (char-to-string (char-after (point))))
+    (unless (or (eobp)
+		(string-match (concat "[" (nth 1 erc) "\n]")
+			      (char-to-string (char-after (point)))))
       (insert " ") (backward-char 1))
     (insert string)
     (and move (backward-char 1))))