summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-11-10 10:22:29 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-11-10 10:23:00 -0800
commitc92dbd6d0c234ff993acb0a095c024593bc185c8 (patch)
treef6e1be4508825d465244f4849e2ab33209d8cc84 /src
parentd149ca81c33ab95900306c3c71f6eff62a3ec1a1 (diff)
downloademacs-c92dbd6d0c234ff993acb0a095c024593bc185c8.tar.gz
Spelling fixes
* lisp/net/soap-inspect.el (soap-inspect-xs-simple-type): Fix misspelling in output.
Diffstat (limited to 'src')
-rw-r--r--src/alloc.c2
-rw-r--r--src/nsterm.h4
-rw-r--r--src/nsterm.m14
-rw-r--r--src/window.c2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 81d644a16ad..bee7cd1758d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5346,7 +5346,7 @@ compact_font_cache_entry (Lisp_Object entry)
}
if (CONSP (objlist))
{
- /* Foiund a marked font, bail out. */
+ /* Found a marked font, bail out. */
break;
}
}
diff --git a/src/nsterm.h b/src/nsterm.h
index 3fb8cfc9cd8..1b330f08636 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -126,7 +126,7 @@ nsterm.m : 6718: [ 4453] | | | | +->> (X:0 Y:0)/(W:1600 H:1177)
Here, "ns_fullscreen_hook" calls "handleFS", which is turn calls
"performZoom". This function calls "[super performZoom]", which
- isn't annoted (so it doesn't show up in the trace). However, it
+ isn't annotated (so it doesn't show up in the trace). However, it
calls "zoom" which is annotated so it is part of the call trace.
Later, the method "windowWillUseStandardFrame" and the function
"setFSValue" are called. The lines with "+---" contain extra
@@ -230,7 +230,7 @@ void nstrace_leave(int *);
/* Function enter macros.
- NSTRACE (fmt, ...) -- Enable trace output in curent block
+ NSTRACE (fmt, ...) -- Enable trace output in current block
(typically a function). Accepts printf-style
arguments.
diff --git a/src/nsterm.m b/src/nsterm.m
index fabfa2914a0..5e6c7484331 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6353,7 +6353,7 @@ not_in_argv (NSString *arg)
/* Restrict the new size to the text gird.
- Don't restict the width if the user only adjusted the height, and
+ Don't restrict the width if the user only adjusted the height, and
vice versa. (Without this, the frame would shrink, and move
slightly, if the window was resized by dragging one of its
borders.) */
@@ -7591,7 +7591,7 @@ not_in_argv (NSString *arg)
/* Constrain size and placement of a frame.
By returning the original "frameRect", the frame is not
- contrained. This can lead to unwanted situations where, for
+ constrained. This can lead to unwanted situations where, for
example, the menu bar covers the frame.
The default implementation (accessed using "super") constrains the
@@ -7647,7 +7647,7 @@ not_in_argv (NSString *arg)
#if 0
// Native zoom done using the standard zoom animation. Size of the
- // resulting frame reduced to accomodate the Dock and, if present,
+ // resulting frame reduced to accommodate the Dock and, if present,
// the menu-bar.
[super zoom:sender];
@@ -7661,8 +7661,8 @@ not_in_argv (NSString *arg)
//
// This works for all practical purposes. (The only minor oddity is
// when transiting from full-height frame to a maximized, the
- // animation reduces the height of the frame slighty (to the 4
- // pixels needed to accomodate the Doc) before it snaps back into
+ // animation reduces the height of the frame slightly (to the 4
+ // pixels needed to accommodate the Doc) before it snaps back into
// full height. The user would need a very trained eye to spot
// this.)
NSScreen * screen = [self screen];
@@ -7702,8 +7702,8 @@ not_in_argv (NSString *arg)
}
}
#else
- // Non-native zoom which is done instantaneous. The resulting frame
- // covert the entire scrren, except the menu-bar, if present.
+ // Non-native zoom which is done instantaneously. The resulting frame
+ // covers the entire screen, except the menu-bar, if present.
NSScreen * screen = [self screen];
if (screen != nil)
{
diff --git a/src/window.c b/src/window.c
index 7c95ff9b16f..0ac76d41861 100644
--- a/src/window.c
+++ b/src/window.c
@@ -210,7 +210,7 @@ wset_update_mode_line (struct window *w)
{
/* If this window is the selected window on its frame, set the
global variable update_mode_lines, so that x_consider_frame_title
- will consider this frame's title for rtedisplay. */
+ will consider this frame's title for redisplay. */
Lisp_Object fselected_window = XFRAME (WINDOW_FRAME (w))->selected_window;
if (WINDOWP (fselected_window) && XWINDOW (fselected_window) == w)