diff options
| author | Juanma Barranquero | 2012-01-03 03:14:40 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2012-01-03 03:14:40 +0100 |
| commit | b81d40f0fe43db0c6a4d71e1aaea6b2c65b27395 (patch) | |
| tree | 1496e12a16747442e95696101a84cdb235c4a24b | |
| parent | 30710442b4725af9f45e9a9b6013f4a3f4e4706b (diff) | |
| download | emacs-b81d40f0fe43db0c6a4d71e1aaea6b2c65b27395.tar.gz emacs-b81d40f0fe43db0c6a4d71e1aaea6b2c65b27395.zip | |
Fix typos.
| -rw-r--r-- | lisp/ChangeLog | 32 | ||||
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/lread.c | 2 |
3 files changed, 23 insertions, 23 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 459eea2a3ec..055d929fc51 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -65,8 +65,8 @@ | |||
| 65 | (gdb-var-delete-children, gdb-edit-value, gdb-var-update) | 65 | (gdb-var-delete-children, gdb-edit-value, gdb-var-update) |
| 66 | (gdb-stopped, def-gdb-auto-update-trigger) | 66 | (gdb-stopped, def-gdb-auto-update-trigger) |
| 67 | (gdb-place-breakpoints, gdb-select-thread, gdb-select-frame) | 67 | (gdb-place-breakpoints, gdb-select-thread, gdb-select-frame) |
| 68 | (gdb-get-changed-registers, gdb-get-main-selected-frame): Callers | 68 | (gdb-get-changed-registers, gdb-get-main-selected-frame): |
| 69 | changed. | 69 | Callers changed. |
| 70 | (gud-gdbmi-completions): New function. | 70 | (gud-gdbmi-completions): New function. |
| 71 | (gdb): Use it for generating the completion table. | 71 | (gdb): Use it for generating the completion table. |
| 72 | 72 | ||
| @@ -76,22 +76,22 @@ | |||
| 76 | locking. Use this to protect declarations from losing their | 76 | locking. Use this to protect declarations from losing their |
| 77 | contexts. | 77 | contexts. |
| 78 | 78 | ||
| 79 | * progmodes/cc-langs.el (c-before-font-lock-functions): replace | 79 | * progmodes/cc-langs.el (c-before-font-lock-functions): Replace |
| 80 | c-set-fl-decl-start with c-change-set-fl-decl-start (Renaming). | 80 | c-set-fl-decl-start with c-change-set-fl-decl-start (Renaming). |
| 81 | (c-before-context-fontification-functions): new defvar, a list of | 81 | (c-before-context-fontification-functions): New defvar, a list of |
| 82 | functions to be run just before context (etc.) font locking. | 82 | functions to be run just before context (etc.) font locking. |
| 83 | 83 | ||
| 84 | * progmodes/cc-mode.el (c-extend-font-lock-region-for-macros): | 84 | * progmodes/cc-mode.el (c-extend-font-lock-region-for-macros): |
| 85 | new, functionality extracted from | 85 | New, functionality extracted from |
| 86 | c-neutralize-syntax-in-and-mark-CPP. | 86 | c-neutralize-syntax-in-and-mark-CPP. |
| 87 | (c-in-after-change-fontification): new variable. | 87 | (c-in-after-change-fontification): New variable. |
| 88 | (c-after-change): Set c-in-after-change-fontification. | 88 | (c-after-change): Set c-in-after-change-fontification. |
| 89 | (c-set-fl-decl-start): Rejig its interface, so it can be called | 89 | (c-set-fl-decl-start): Rejig its interface, so it can be called |
| 90 | from both after-change and context fontifying. | 90 | from both after-change and context fontifying. |
| 91 | (c-change-set-fl-decl-start, c-context-set-fl-decl-start): new | 91 | (c-change-set-fl-decl-start, c-context-set-fl-decl-start): |
| 92 | functions. | 92 | New functions. |
| 93 | (c-standard-font-lock-fontify-region-function): new variable. | 93 | (c-standard-font-lock-fontify-region-function): New variable. |
| 94 | (c-font-lock-fontify-region): new function. | 94 | (c-font-lock-fontify-region): New function. |
| 95 | 95 | ||
| 96 | 2011-12-24 Juri Linkov <juri@jurta.org> | 96 | 2011-12-24 Juri Linkov <juri@jurta.org> |
| 97 | 97 | ||
| @@ -107,17 +107,17 @@ | |||
| 107 | 107 | ||
| 108 | Fix unstable fontification inside templates. | 108 | Fix unstable fontification inside templates. |
| 109 | 109 | ||
| 110 | * progmodes/cc-langs.el (c-before-font-lock-functions): newly | 110 | * progmodes/cc-langs.el (c-before-font-lock-functions): |
| 111 | created from the singular version. The (c c++ objc) entry now | 111 | Newly created from the singular version. The (c c++ objc) entry now |
| 112 | additionally has c-set-fl-decl-start. The other languages (apart | 112 | additionally has c-set-fl-decl-start. The other languages (apart |
| 113 | from AWK) have that as a single entry. | 113 | from AWK) have that as a single entry. |
| 114 | 114 | ||
| 115 | * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): The | 115 | * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): |
| 116 | functionality for "local" declarations has been extracted to | 116 | The functionality for "local" declarations has been extracted to |
| 117 | c-set-fl-decl-start. | 117 | c-set-fl-decl-start. |
| 118 | 118 | ||
| 119 | * progmodes/cc-mode.el: (c-common-init, c-after-change): Changes | 119 | * progmodes/cc-mode.el (c-common-init, c-after-change): |
| 120 | due to pluralisation of c-before-font-lock-functions. | 120 | Changes due to pluralisation of c-before-font-lock-functions. |
| 121 | (c-set-fl-decl-start): New function, extracted from | 121 | (c-set-fl-decl-start): New function, extracted from |
| 122 | c-font-lock-enclosing-decls and enhanced. | 122 | c-font-lock-enclosing-decls and enhanced. |
| 123 | 123 | ||
diff --git a/src/ChangeLog b/src/ChangeLog index 829895d1b72..31d6ecaca43 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -41,8 +41,8 @@ | |||
| 41 | 41 | ||
| 42 | 2011-12-21 Jan Djärv <jan.h.d@swipnet.se> | 42 | 2011-12-21 Jan Djärv <jan.h.d@swipnet.se> |
| 43 | 43 | ||
| 44 | * nsterm.m (x_free_frame_resources): Release | 44 | * nsterm.m (x_free_frame_resources): |
| 45 | f->output_data.ns->miniimage | 45 | Release f->output_data.ns->miniimage. |
| 46 | (ns_index_color): Fix indentation. Do not retain | 46 | (ns_index_color): Fix indentation. Do not retain |
| 47 | color_table->colors[i]. | 47 | color_table->colors[i]. |
| 48 | 48 | ||
| @@ -94,10 +94,10 @@ | |||
| 94 | Fns_store_cut_buffer_internal. | 94 | Fns_store_cut_buffer_internal. |
| 95 | (ns_get_foreign_selection, Fx_own_selection_internal) | 95 | (ns_get_foreign_selection, Fx_own_selection_internal) |
| 96 | (Fx_disown_selection_internal, Fx_selection_exists_p) | 96 | (Fx_disown_selection_internal, Fx_selection_exists_p) |
| 97 | (Fns_get_selection_internal, Fns_store_selection_internal): Use | 97 | (Fns_get_selection_internal, Fns_store_selection_internal): |
| 98 | ns_symbol_to_pb and check if return value is nil. | 98 | Use ns_symbol_to_pb and check if return value is nil. |
| 99 | (syms_of_nsselect): Remove ifdef CUT_BUFFER_SUPPORT. Remove | 99 | (syms_of_nsselect): Remove ifdef CUT_BUFFER_SUPPORT. Remove defsubr |
| 100 | defsubr Sns_rotate_cut_buffers_internal. Sns_get_cut_buffer_internal | 100 | Sns_rotate_cut_buffers_internal. Sns_get_cut_buffer_internal |
| 101 | renamed to Sns_get_selection_internal, Sns_store_cut_buffer_internal | 101 | renamed to Sns_get_selection_internal, Sns_store_cut_buffer_internal |
| 102 | renamed to Sns_store_selection_internal. | 102 | renamed to Sns_store_selection_internal. |
| 103 | (ns_handle_selection_request): Move code to Fx_own_selection_internal | 103 | (ns_handle_selection_request): Move code to Fx_own_selection_internal |
diff --git a/src/lread.c b/src/lread.c index 7c0b0475786..8e6b6f65e25 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -3113,7 +3113,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) | |||
| 3113 | if (uninterned_symbol && ! NILP (Vpurify_flag)) | 3113 | if (uninterned_symbol && ! NILP (Vpurify_flag)) |
| 3114 | name = make_pure_string (read_buffer, nchars, nbytes, multibyte); | 3114 | name = make_pure_string (read_buffer, nchars, nbytes, multibyte); |
| 3115 | else | 3115 | else |
| 3116 | name = make_specified_string (read_buffer, nchars, nbytes,multibyte); | 3116 | name = make_specified_string (read_buffer, nchars, nbytes, multibyte); |
| 3117 | result = (uninterned_symbol ? Fmake_symbol (name) | 3117 | result = (uninterned_symbol ? Fmake_symbol (name) |
| 3118 | : Fintern (name, Qnil)); | 3118 | : Fintern (name, Qnil)); |
| 3119 | 3119 | ||