diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.11 | 4 | ||||
| -rw-r--r-- | src/ccl.c | 2 | ||||
| -rw-r--r-- | src/fontset.c | 2 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 | ||||
| -rw-r--r-- | src/sound.c | 2 | ||||
| -rw-r--r-- | src/sysdep.c | 2 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 85f6c00eaaf..896f08916b3 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -7199,7 +7199,7 @@ 2010-06-27 Chong Yidong <cyd@stupidchicken.com> - * xfns.c (Fx_create_frame): Don't consult X resouces when setting + * xfns.c (Fx_create_frame): Don't consult X resources when setting menu-bar-lines and tool-bar-lines. Use menu-bar-mode and tool-bar-mode, which are now set using these X resources at startup, to determine the defaults (Bug#2249). @@ -29136,7 +29136,7 @@ * lisp.h (defvar_per_buffer, DEFVAR_PER_BUFFER): * lread.c (defvar_per_buffer): - * abbrev.c (syms_of_abbrev) <local-abbrev-tabl>: Move to buffer.c. + * abbrev.c (syms_of_abbrev) <local-abbrev-table>: Move to buffer.c. * window.c (candidate_window_p): Only consider as visible frames that are on the same terminal. diff --git a/src/ccl.c b/src/ccl.c index 2b4f04d1247..84d7a6a25ff 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -826,7 +826,7 @@ while (0) : (charset = CHARSET_FROM_ID ((id)), DECODE_CHAR (charset, (code)))) /* Encode character C by some of charsets in CHARSET_LIST. Set ID to - the id of the used charset, ENCODED to the resulf of encoding. + the id of the used charset, ENCODED to the result of encoding. Assume that we can use the variable `charset'. */ #define CCL_ENCODE_CHAR(c, charset_list, id, encoded) \ diff --git a/src/fontset.c b/src/fontset.c index e20d7957c7f..9697f62ea72 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -905,7 +905,7 @@ face_suitable_for_char_p (struct face *face, int c) /* Return ID of face suitable for displaying character C on frame F. - FACE must be reazlied for ASCII characters in advance. Called from + FACE must be realized for ASCII characters in advance. Called from the macro FACE_FOR_CHAR. */ int diff --git a/src/gtkutil.c b/src/gtkutil.c index 3df46afcd3a..7e6f5c3164d 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -2363,7 +2363,7 @@ xg_create_one_menuitem (widget_value *item, HIGHLIGHT_CB is the callback to call when entering/leaving menu items. POP_UP_P is non-zero if we shall create a popup menu. MENU_BAR_P is non-zero if we shall create a menu bar. - ADD_TEAROFF_P is non-zero if we shall add a teroff menu item. Ignored + ADD_TEAROFF_P is non-zero if we shall add a tearoff menu item. Ignored if MENU_BAR_P is non-zero. TOPMENU is the topmost GtkWidget that others shall be placed under. It may be NULL, in that case we create the appropriate widget diff --git a/src/sound.c b/src/sound.c index 39007574afc..4e9758d27df 100644 --- a/src/sound.c +++ b/src/sound.c @@ -267,7 +267,7 @@ struct sound read from the start of a sound file. */ char *header; - /* Number of bytes raed from sound file. This is always <= + /* Number of bytes read from sound file. This is always <= MAX_SOUND_HEADER_BYTES. */ int header_size; diff --git a/src/sysdep.c b/src/sysdep.c index d666f8dbb79..ae200308bf3 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -1663,7 +1663,7 @@ init_signals (void) sys_siglist[SIGQUIT] = "Quit"; # endif # ifdef SIGRETRACT - sys_siglist[SIGRETRACT] = "Need to relinguish monitor mode"; + sys_siglist[SIGRETRACT] = "Need to relinquish monitor mode"; # endif # ifdef SIGSAK sys_siglist[SIGSAK] = "Secure attention"; diff --git a/src/xfns.c b/src/xfns.c index 88e8ac595c5..c68149cce11 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5914,7 +5914,7 @@ the tool bar buttons. */); x_gtk_whole_detached_tool_bar = 0; DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips, - doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ toolip is used. + doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used. Otherwise use Emacs own tooltip implementation. When using Gtk+ tooltips, the tooltip face is not used. */); x_gtk_use_system_tooltips = 1; |