emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r114961: Spelling fixes.


From: Paul Eggert
Subject: [Emacs-diffs] trunk r114961: Spelling fixes.
Date: Tue, 05 Nov 2013 07:44:41 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 114961
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-11-04 23:44:14 -0800
message:
  Spelling fixes.
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/composite.el              
composite.el-20091113204419-o5vbwnq5f7feedwu-1730
  lisp/emacs-lisp/ert.el         ert.el-20110112160650-056hnl9qhpjvjicy-2
  lisp/progmodes/verilog-mode.el 
verilogmode.el-20091113204419-o5vbwnq5f7feedwu-8207
  src/fileio.c                   fileio.c-20091113204419-o5vbwnq5f7feedwu-210
  src/macfont.m                  macfont.m-20130915173740-04lgloz0557bz98l-2
  src/w32inevt.c                 w32inevt.c-20091113204419-o5vbwnq5f7feedwu-813
=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-11-04 15:34:42 +0000
+++ b/etc/NEWS  2013-11-05 07:44:14 +0000
@@ -232,7 +232,7 @@
 ** prolog-use-smie has been removed, along with the non-SMIE indentation code.
 
 ** SMIE indentation can be customized via `smie-config'.
-The customizaton can be guessed by Emacs by providing a sample indented
+The customization can be guessed by Emacs by providing a sample indented
 file and letting SMIE learn from it.
 
 ** sh-script now uses its SMIE indentation algorithm by default.

=== modified file 'lisp/composite.el'
--- a/lisp/composite.el 2013-09-12 14:45:28 +0000
+++ b/lisp/composite.el 2013-11-05 07:44:14 +0000
@@ -630,14 +630,14 @@
                   ((and (= class 0)
                         (eq (get-char-code-property (lglyph-char glyph)
                                                     'general-category) 'Me))
-                   ;; Artificially layouting glyphs in an enclosing
+                   ;; Artificially laying out glyphs in an enclosing
                    ;; mark is difficult.  All we can do is to adjust
                    ;; the x-offset and width of the base glyph to
                    ;; align it at the center of the glyph of the
                    ;; enclosing mark hoping that the enclosing mark
                    ;; is big enough.  We also have to adjust the
                    ;; x-offset and width of the mark ifself properly
-                   ;; depending on how the glyph is designed
+                   ;; depending on how the glyph is designed.
 
                    ;; (non-spacing or not).  For instance, when we
                    ;; have these glyphs:

=== modified file 'lisp/emacs-lisp/ert.el'
--- a/lisp/emacs-lisp/ert.el    2013-10-25 12:07:34 +0000
+++ b/lisp/emacs-lisp/ert.el    2013-11-05 07:44:14 +0000
@@ -436,7 +436,7 @@
 
 (cl-defmacro ert--skip-unless (form)
   "Evaluate FORM.  If it returns nil, skip the current test.
-Errors during evaluation are catched and handled like nil."
+Errors during evaluation are caught and handled like nil."
   (declare (debug t))
   (ert--expand-should `(skip-unless ,form) form
                       (lambda (inner-form form-description-form _value-var)

=== modified file 'lisp/progmodes/verilog-mode.el'
--- a/lisp/progmodes/verilog-mode.el    2013-10-20 10:13:26 +0000
+++ b/lisp/progmodes/verilog-mode.el    2013-11-05 07:44:14 +0000
@@ -5460,7 +5460,7 @@
        (catch 'continue
          (cond
           ((equal (char-after) ?\{)
-            ;; block type returned based on outer contraint { or inner
+            ;; block type returned based on outer constraint { or inner
            (if (verilog-at-constraint-p)
                 (cond (inconstraint (throw 'nesting 'constraint))
                       (t            (throw 'nesting 'statement)))))
@@ -11101,7 +11101,7 @@
   it is a good idea to do this for all connections in a template,
   as then they will work for any width signal, and with AUTOWIRE.
   See PTL_BUS becoming PTL_BUSNEW below.
- 
+
   Inside a template, a [] in a connection name (with nothing else inside
   the brackets) will be replaced by the same bus subscript as it is being
   connected to, or the [] will be removed if it is a single bit signal.

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2013-11-04 17:30:33 +0000
+++ b/src/fileio.c      2013-11-05 07:44:14 +0000
@@ -997,7 +997,7 @@
                 unibyte.  Do not convert DEFAULT_DIRECTORY to
                 multibyte; instead, convert NAME to a unibyte string,
                 so that the result of this function is also a unibyte
-                string.  This is needed during bootstraping and
+                string.  This is needed during bootstrapping and
                 dumping, when Emacs cannot decode file names, because
                 the locale environment is not set up.  */
              name = make_unibyte_string (SSDATA (name), SBYTES (name));

=== modified file 'src/macfont.m'
--- a/src/macfont.m     2013-11-04 17:57:17 +0000
+++ b/src/macfont.m     2013-11-05 07:44:14 +0000
@@ -64,7 +64,7 @@
 #endif
 
 /* The font property key specifying the font design destination.  The
-   value is an unsigned integer code: 0 for WYSIWIG, and 1 for Video
+   value is an unsigned integer code: 0 for WYSIWYG, and 1 for Video
    text.  (See the documentation of X Logical Font Description
    Conventions.)  In the Mac font driver, 1 means the screen font is
    used for calculating some glyph metrics.  You can see the
@@ -366,7 +366,7 @@
   if (!(textStorage && layoutManager && textContainer))
     {
       [textStorage release];
-      
+
       return 0;
     }
 
@@ -1166,7 +1166,7 @@
 
     /* The cached glyph for a character c is stored as the (c %
        NGLYPHS_IN_VALUE)-th CGGlyph block of a value for the key (c /
-       NGLYPHS_IN_VALUE).  However, the glyph for a BMP characrer c is
+       NGLYPHS_IN_VALUE).  However, the glyph for a BMP character c is
        not stored here if row_nkeys_or_perm[c / 256] >=
        ROW_PERM_OFFSET.  */
     CFMutableDictionaryRef dictionary;
@@ -2472,7 +2472,7 @@
   macfont_info = (struct macfont_info *) font;
   macfont_info->macfont = macfont;
   macfont_info->cgfont = mac_font_copy_graphics_font (macfont);
-  
+
   val = assq_no_quit (QCdestination, AREF (entity, FONT_EXTRA_INDEX));
   if (CONSP (val) && EQ (XCDR (val), make_number (1)))
     macfont_info->screen_font = mac_screen_font_create_with_name (font_name,
@@ -2679,7 +2679,7 @@
     }
   unblock_input ();
 
-  if (metrics) 
+  if (metrics)
     metrics->width = width;
 
   return width;
@@ -2741,7 +2741,7 @@
       for (i = 0; i < len; i++)
        {
          int width;
- 
+
          glyphs[i] = *(s->char2b + s->cmp_from + i);
          width = (s->padding_p ? 1
                   : macfont_glyph_extents (s->font, glyphs[i],
@@ -3001,7 +3001,7 @@
 #define BUINT32_VALUE(lval)    OSReadBigInt32 (&(lval), 0)
 
 /* Return UVS subtable for the specified FONT.  If the subtable is not
-   found or ill-formated, then return NULL.  */
+   found or ill-formatted, then return NULL.  */
 
 static CFDataRef
 mac_font_copy_uvs_table (FontRef font)

=== modified file 'src/w32inevt.c'
--- a/src/w32inevt.c    2013-10-15 18:38:26 +0000
+++ b/src/w32inevt.c    2013-11-05 07:44:14 +0000
@@ -518,7 +518,7 @@
                              help_echo_window, help_echo_object,
                              help_echo_pos);
          }
-       /* We alread called kbd_buffer_store_event, so indicate the
+       /* We already called kbd_buffer_store_event, so indicate the
           the caller it shouldn't.  */
        return 0;
       }


reply via email to

[Prev in Thread] Current Thread [Next in Thread]