summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2011-09-17 14:19:04 +0200
committerJuanma Barranquero <lekktu@gmail.com>2011-09-17 14:19:04 +0200
commit8d5ed89901195abc4a5d660371ea26e849292ea6 (patch)
treeebcb44d54e2a38241924e322b63b9da932c27892
parent744ba0e3eedce992b2d7b8683dfca041939556c4 (diff)
downloademacs-8d5ed89901195abc4a5d660371ea26e849292ea6.tar.gz
Fix typos.
-rw-r--r--lisp/org/ChangeLog4
-rw-r--r--lisp/org/org.el2
-rw-r--r--lisp/progmodes/cc-fonts.el2
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xmenu.c2
5 files changed, 8 insertions, 4 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))
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 1178a8a0b7e..fd817e3b4f4 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -290,7 +290,7 @@
res))))
(defun c-make-font-lock-search-form (regexp highlights)
- ;; Return a lisp form which will fontify every occurence of REGEXP
+ ;; Return a lisp form which will fontify every occurrence of REGEXP
;; (a regular expression, NOT a function) between POINT and `limit'
;; with HIGHLIGHTS, a list of highlighters as specified on page
;; "Search-based Fontification" in the elisp manual.
diff --git a/src/ChangeLog b/src/ChangeLog
index c6238701301..d09c970bc03 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1303,7 +1303,7 @@
underline, overline, and strike-through.
(ns_dumpglyphs_image, ns_dumpglyphs_stretch): Add call to
ns_draw_text_decoration. Change treatment of cursor drawing to
- accomomdate underlining, etc.
+ accommodate underlining, etc.
2011-07-28 Eli Zaretskii <eliz@gnu.org>
diff --git a/src/xmenu.c b/src/xmenu.c
index cf58e85af10..7fcd2ad3724 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -742,7 +742,7 @@ menu_highlight_callback (GtkWidget *widget, gpointer call_data)
/* If popup_activated_flag is greater than 1 we are in a popup menu.
Don't pass the frame to show_help_event for those.
Passing frame creates an Emacs event. As we are looping in
- popup_widget_loop, it won't be handeled. Passing NULL shows the tip
+ popup_widget_loop, it won't be handled. Passing NULL shows the tip
directly without using an Emacs event. This is what the Lucid code
does below. */
show_help_event (popup_activated_flag <= 1 ? cb_data->cl_data->f : NULL,