summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-02-16 17:59:57 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2010-02-16 17:59:57 +0100
commitca19fab38033afface85b7b7b9dd4941abbfb1d8 (patch)
tree2f5663bd882f9d3a073101b829eb2741148e9ecd
parent8bb407117ba0c3fd5531c444f78b807daac96831 (diff)
downloadorg-mode-ca19fab38033afface85b7b7b9dd4941abbfb1d8.tar.gz
Fix minor bug.
-rwxr-xr-xlisp/ChangeLog1
-rw-r--r--lisp/org.el5
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77b2982..7a6d33d 100755
--- a/lisp/ChangeLog
+++ b/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>
diff --git a/lisp/org.el b/lisp/org.el
index a276d3b..b888833 100644
--- a/lisp/org.el
+++ b/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))))