upstream

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index d63929d794e..1c320f20e51 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.el (org-toggle-pretty-entities): Fix typo in message.
+
 2011-09-02  Chong Yidong  <cyd@stupidchicken.com>
 
         * org-compat.el (org-pop-to-buffer-same-window): Deleted.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index d494bdb28fa..419ff022cf6 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -5660,7 +5660,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
   (org-set-local 'org-pretty-entities (not org-pretty-entities))
   (org-restart-font-lock)
   (if org-pretty-entities
-      (message "Entities are displayed as UTF8 characers")
+      (message "Entities are displayed as UTF8 characters")
     (save-restriction
       (widen)
       (org-decompose-region (point-min) (point-max))