[Emacs-diffs] /srv/bzr/emacs/trunk r112089: Spelling fixes.

[Paul Eggert]

------------------------------------------------------------
revno: 112089
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-03-18 21:41:53 -0700
message:
  Spelling fixes.
modified:
  lisp/international/ja-dic-cnv.el
  src/alloc.c
  src/coding.c
  src/dispextern.h
  src/image.c
  src/xfaces.c

=== modified file 'lisp/international/ja-dic-cnv.el'
--- a/lisp/international/ja-dic-cnv.el  2013-03-18 04:30:20 +0000
+++ b/lisp/international/ja-dic-cnv.el  2013-03-19 04:41:53 +0000
@@ -330,7 +330,7 @@
   (interactive "FSKK dictionary file: ")
   (message "Reading file \"%s\" ..." filename)
   (let* ((coding-system-for-read 'euc-japan)
-        (skkbuf (get-buffer-create " *skkdic-unnannotated*"))
+        (skkbuf (get-buffer-create " *skkdic-unannotated*"))
         (buf (get-buffer-create "*skkdic-work*")))
     ;; Set skkbuf to an unannotated copy of the dictionary.
     (with-current-buffer skkbuf

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2013-03-13 07:27:34 +0000
+++ b/src/alloc.c       2013-03-19 04:41:53 +0000
@@ -1162,7 +1162,7 @@
 #define INTERVAL_BLOCK_SIZE \
   ((1020 - sizeof (struct interval_block *)) / sizeof (struct interval))
 
-/* Intervals are allocated in chunks in form of an interval_block
+/* Intervals are allocated in chunks in the form of an interval_block
    structure.  */
 
 struct interval_block

=== modified file 'src/coding.c'
--- a/src/coding.c      2013-03-15 20:03:31 +0000
+++ b/src/coding.c      2013-03-19 04:41:53 +0000
@@ -6075,7 +6075,7 @@
 static Lisp_Object adjust_coding_eol_type (struct coding_system *coding, int 
eol_seen);
 
 
-/* Return 1 if all the source bytes are ASCII, and return 0 otherwize.
+/* Return true iff all the source bytes are ASCII.
    By side effects, set coding->head_ascii and coding->eol_seen.  The
    value of coding->eol_seen is "logical or" of EOL_SEEN_LF,
    EOL_SEEN_CR, and EOL_SEEN_CRLF, but the value is reliable only when

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2013-03-17 14:34:18 +0000
+++ b/src/dispextern.h  2013-03-19 04:41:53 +0000
@@ -602,8 +602,8 @@
 
    2. Window glyph matrices on frames having frame glyph matrices.
    Such matrices are sub-matrices of their corresponding frame matrix,
-   i.e. frame glyph matrices and window glyph matrices share the same
-   glyph memory which is allocated in form of a glyph_pool structure.
+   i.e., frame glyph matrices and window glyph matrices share the same
+   glyph memory, which is allocated in the form of a glyph_pool structure.
    Glyph rows in such a window matrix are slices of frame matrix rows.
 
    2. Free-standing window glyph matrices managing their own glyph

=== modified file 'src/image.c'
--- a/src/image.c       2013-03-17 14:34:18 +0000
+++ b/src/image.c       2013-03-19 04:41:53 +0000
@@ -154,15 +154,15 @@
   return pixmap;
 }
 
-/* use with imgs created by ns_image_for_XPM */
+/* Use with images created by ns_image_for_XPM.  */
 unsigned long
 XGetPixel (XImagePtr ximage, int x, int y)
 {
   return ns_get_pixel (ximage, x, y);
 }
 
-/* use with imgs created by ns_image_for_XPM; alpha set to 1;
-   pixel is assumed to be in form RGB */
+/* Use with images created by ns_image_for_XPM; alpha set to 1;
+   pixel is assumed to be in RGB form.  */
 void
 XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel)
 {

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2013-02-15 12:26:42 +0000
+++ b/src/xfaces.c      2013-03-19 04:41:53 +0000
@@ -112,7 +112,7 @@
    merging faces of that character, that face is `realized'.  The
    realization process maps face attributes to what is physically
    available on the system where Emacs runs.  The result is a
-   `realized face' in form of a struct face which is stored in the
+   `realized face' in the form of a struct face which is stored in the
    face cache of the frame on which it was realized.
 
    Face realization is done in the context of the character to display