aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2011-09-17 14:19:04 +0200
committerJuanma Barranquero2011-09-17 14:19:04 +0200
commit8d5ed89901195abc4a5d660371ea26e849292ea6 (patch)
treeebcb44d54e2a38241924e322b63b9da932c27892
parent744ba0e3eedce992b2d7b8683dfca041939556c4 (diff)
downloademacs-8d5ed89901195abc4a5d660371ea26e849292ea6.tar.gz
emacs-8d5ed89901195abc4a5d660371ea26e849292ea6.zip
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 @@
12011-09-17 Juanma Barranquero <lekktu@gmail.com>
2
3 * org.el (org-toggle-pretty-entities): Fix typo in message.
4
12011-09-02 Chong Yidong <cyd@stupidchicken.com> 52011-09-02 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * org-compat.el (org-pop-to-buffer-same-window): Deleted. 7 * 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.")
5660 (org-set-local 'org-pretty-entities (not org-pretty-entities)) 5660 (org-set-local 'org-pretty-entities (not org-pretty-entities))
5661 (org-restart-font-lock) 5661 (org-restart-font-lock)
5662 (if org-pretty-entities 5662 (if org-pretty-entities
5663 (message "Entities are displayed as UTF8 characers") 5663 (message "Entities are displayed as UTF8 characters")
5664 (save-restriction 5664 (save-restriction
5665 (widen) 5665 (widen)
5666 (org-decompose-region (point-min) (point-max)) 5666 (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 @@
290 res)))) 290 res))))
291 291
292 (defun c-make-font-lock-search-form (regexp highlights) 292 (defun c-make-font-lock-search-form (regexp highlights)
293 ;; Return a lisp form which will fontify every occurence of REGEXP 293 ;; Return a lisp form which will fontify every occurrence of REGEXP
294 ;; (a regular expression, NOT a function) between POINT and `limit' 294 ;; (a regular expression, NOT a function) between POINT and `limit'
295 ;; with HIGHLIGHTS, a list of highlighters as specified on page 295 ;; with HIGHLIGHTS, a list of highlighters as specified on page
296 ;; "Search-based Fontification" in the elisp manual. 296 ;; "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 @@
1303 underline, overline, and strike-through. 1303 underline, overline, and strike-through.
1304 (ns_dumpglyphs_image, ns_dumpglyphs_stretch): Add call to 1304 (ns_dumpglyphs_image, ns_dumpglyphs_stretch): Add call to
1305 ns_draw_text_decoration. Change treatment of cursor drawing to 1305 ns_draw_text_decoration. Change treatment of cursor drawing to
1306 accomomdate underlining, etc. 1306 accommodate underlining, etc.
1307 1307
13082011-07-28 Eli Zaretskii <eliz@gnu.org> 13082011-07-28 Eli Zaretskii <eliz@gnu.org>
1309 1309
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)
742 /* If popup_activated_flag is greater than 1 we are in a popup menu. 742 /* If popup_activated_flag is greater than 1 we are in a popup menu.
743 Don't pass the frame to show_help_event for those. 743 Don't pass the frame to show_help_event for those.
744 Passing frame creates an Emacs event. As we are looping in 744 Passing frame creates an Emacs event. As we are looping in
745 popup_widget_loop, it won't be handeled. Passing NULL shows the tip 745 popup_widget_loop, it won't be handled. Passing NULL shows the tip
746 directly without using an Emacs event. This is what the Lucid code 746 directly without using an Emacs event. This is what the Lucid code
747 does below. */ 747 does below. */
748 show_help_event (popup_activated_flag <= 1 ? cb_data->cl_data->f : NULL, 748 show_help_event (popup_activated_flag <= 1 ? cb_data->cl_data->f : NULL,