aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-03-18 21:41:53 -0700
committerPaul Eggert2013-03-18 21:41:53 -0700
commitbad98418bf75efc6dd8ac393157413bc6ef769b4 (patch)
treeee2151b8a97dc2b71ab938e2a1938720d876ec1b /src
parent627b52b0c6f73edc94db90b1f76bd9f44a626ffd (diff)
downloademacs-bad98418bf75efc6dd8ac393157413bc6ef769b4.tar.gz
emacs-bad98418bf75efc6dd8ac393157413bc6ef769b4.zip
Spelling fixes.
Diffstat (limited to 'src')
-rw-r--r--src/alloc.c2
-rw-r--r--src/coding.c2
-rw-r--r--src/dispextern.h4
-rw-r--r--src/image.c6
-rw-r--r--src/xfaces.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/alloc.c b/src/alloc.c
index b2703c5f961..5e30c1b20ad 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1162,7 +1162,7 @@ lisp_align_free (void *block)
1162#define INTERVAL_BLOCK_SIZE \ 1162#define INTERVAL_BLOCK_SIZE \
1163 ((1020 - sizeof (struct interval_block *)) / sizeof (struct interval)) 1163 ((1020 - sizeof (struct interval_block *)) / sizeof (struct interval))
1164 1164
1165/* Intervals are allocated in chunks in form of an interval_block 1165/* Intervals are allocated in chunks in the form of an interval_block
1166 structure. */ 1166 structure. */
1167 1167
1168struct interval_block 1168struct interval_block
diff --git a/src/coding.c b/src/coding.c
index 6cfcec905a1..8a09cd67859 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6075,7 +6075,7 @@ complement_process_encoding_system (Lisp_Object coding_system)
6075static Lisp_Object adjust_coding_eol_type (struct coding_system *coding, int eol_seen); 6075static Lisp_Object adjust_coding_eol_type (struct coding_system *coding, int eol_seen);
6076 6076
6077 6077
6078/* Return 1 if all the source bytes are ASCII, and return 0 otherwize. 6078/* Return true iff all the source bytes are ASCII.
6079 By side effects, set coding->head_ascii and coding->eol_seen. The 6079 By side effects, set coding->head_ascii and coding->eol_seen. The
6080 value of coding->eol_seen is "logical or" of EOL_SEEN_LF, 6080 value of coding->eol_seen is "logical or" of EOL_SEEN_LF,
6081 EOL_SEEN_CR, and EOL_SEEN_CRLF, but the value is reliable only when 6081 EOL_SEEN_CR, and EOL_SEEN_CRLF, but the value is reliable only when
diff --git a/src/dispextern.h b/src/dispextern.h
index a696abfddbb..1f269902435 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -602,8 +602,8 @@ struct glyph_pool
602 602
603 2. Window glyph matrices on frames having frame glyph matrices. 603 2. Window glyph matrices on frames having frame glyph matrices.
604 Such matrices are sub-matrices of their corresponding frame matrix, 604 Such matrices are sub-matrices of their corresponding frame matrix,
605 i.e. frame glyph matrices and window glyph matrices share the same 605 i.e., frame glyph matrices and window glyph matrices share the same
606 glyph memory which is allocated in form of a glyph_pool structure. 606 glyph memory, which is allocated in the form of a glyph_pool structure.
607 Glyph rows in such a window matrix are slices of frame matrix rows. 607 Glyph rows in such a window matrix are slices of frame matrix rows.
608 608
609 2. Free-standing window glyph matrices managing their own glyph 609 2. Free-standing window glyph matrices managing their own glyph
diff --git a/src/image.c b/src/image.c
index 0d4bc82f3b4..2c0f6e3b8c1 100644
--- a/src/image.c
+++ b/src/image.c
@@ -154,15 +154,15 @@ XGetImage (Display *display, Pixmap pixmap, int x, int y,
154 return pixmap; 154 return pixmap;
155} 155}
156 156
157/* use with imgs created by ns_image_for_XPM */ 157/* Use with images created by ns_image_for_XPM. */
158unsigned long 158unsigned long
159XGetPixel (XImagePtr ximage, int x, int y) 159XGetPixel (XImagePtr ximage, int x, int y)
160{ 160{
161 return ns_get_pixel (ximage, x, y); 161 return ns_get_pixel (ximage, x, y);
162} 162}
163 163
164/* use with imgs created by ns_image_for_XPM; alpha set to 1; 164/* Use with images created by ns_image_for_XPM; alpha set to 1;
165 pixel is assumed to be in form RGB */ 165 pixel is assumed to be in RGB form. */
166void 166void
167XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel) 167XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel)
168{ 168{
diff --git a/src/xfaces.c b/src/xfaces.c
index 71709446c1d..28bccd392dc 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -112,7 +112,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
112 merging faces of that character, that face is `realized'. The 112 merging faces of that character, that face is `realized'. The
113 realization process maps face attributes to what is physically 113 realization process maps face attributes to what is physically
114 available on the system where Emacs runs. The result is a 114 available on the system where Emacs runs. The result is a
115 `realized face' in form of a struct face which is stored in the 115 `realized face' in the form of a struct face which is stored in the
116 face cache of the frame on which it was realized. 116 face cache of the frame on which it was realized.
117 117
118 Face realization is done in the context of the character to display 118 Face realization is done in the context of the character to display