emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] trunk r115342: Spelling and punctuation fixes.


From: Paul Eggert
Subject: [Emacs-diffs] trunk r115342: Spelling and punctuation fixes.
Date: Sun, 01 Dec 2013 22:33:19 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 115342
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-12-01 14:33:13 -0800
message:
  Spelling and punctuation fixes.
modified:
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  lisp/ChangeLog.16              changelog.16-20130618111706-x8cck4o4rjixg8cl-1
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94
  lwlib/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-1447
  src/ChangeLog.12               changelog.12-20130618111706-x8cck4o4rjixg8cl-2
  src/alloc.c                    alloc.c-20091113204419-o5vbwnq5f7feedwu-252
  src/blockinput.h               
blockinput.h-20091113204419-o5vbwnq5f7feedwu-561
  src/buffer.h                   buffer.h-20091113204419-o5vbwnq5f7feedwu-196
  src/charset.h                  charset.h-20091113204419-o5vbwnq5f7feedwu-1076
  src/chartab.c                  chartab.c-20091113204419-o5vbwnq5f7feedwu-8539
  src/dispextern.h               
dispextern.h-20091113204419-o5vbwnq5f7feedwu-218
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229
  src/lread.c                    lread.c-20091113204419-o5vbwnq5f7feedwu-266
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
  src/print.c                    print.c-20091113204419-o5vbwnq5f7feedwu-262
  src/regex.c                    regex.c-20091113204419-o5vbwnq5f7feedwu-518
  src/w32fns.c                   w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
  src/xrdb.c                     xrdb.c-20091113204419-o5vbwnq5f7feedwu-177
  test/automated/reftex-tests.el 
reftextests.el-20130612124554-85p8611s89zewixv-1
=== modified file 'configure.ac'
--- a/configure.ac      2013-11-30 02:06:34 +0000
+++ b/configure.ac      2013-12-01 22:33:13 +0000
@@ -3843,7 +3843,7 @@
 dnl decides that a command-line argument to be passed to a MinGW program
 dnl is a PATH-style list of directories.  But that heuristics plays it
 dnl safe, and only does the replacement when it is _absolutely_ sure it
-dnl sees a colon-seperated list of file names; e.g. ":." is left alone,
+dnl sees a colon-separated list of file names; e.g. ":." is left alone,
 dnl which breaks in-tree builds.  So we do this manually instead.
 dnl Note that we cannot rely on PATH_SEPARATOR, as that one will always
 dnl be computed as ':' in MSYS Bash.

=== modified file 'lisp/ChangeLog.16'
--- a/lisp/ChangeLog.16 2013-10-13 00:28:30 +0000
+++ b/lisp/ChangeLog.16 2013-12-01 22:33:13 +0000
@@ -3730,7 +3730,8 @@
 2012-11-19  Daniel Colascione  <address@hidden>
 
        * term/w32-win.el (cygwin-convert-path-from-windows):
-       Accomodate rename of cygwin_convert_path* to cygwin_convert_file_name*.
+       Accommodate rename of cygwin_convert_path* to
+       cygwin_convert_file_name*.
 
 2012-11-18  Chong Yidong  <address@hidden>
 

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-12-01 17:00:04 +0000
+++ b/lisp/net/eww.el   2013-12-01 22:33:13 +0000
@@ -992,7 +992,7 @@
       (eww-browse-url url)))))
 
 (defun eww-same-page-p (url1 url2)
-  "Return non-nil if boths URLs represent the same page.
+  "Return non-nil if both URLs represent the same page.
 Differences in #targets are ignored."
   (let ((obj1 (url-generic-parse-url url1))
        (obj2 (url-generic-parse-url url2)))

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2013-12-01 15:49:18 +0000
+++ b/lisp/net/shr.el   2013-12-01 22:33:13 +0000
@@ -1139,7 +1139,7 @@
           (setq pref new-pref
                 url (cdr (assq :src elem)))
           (message "new %s %s" url pref))
-        ;; libxml's html parser isn't HML5 compliant and non terminated
+        ;; libxml's html parser isn't HTML5 compliant and non terminated
         ;; source tags might end up as children.  So recursion it is...
         (dolist (child (cdr elem))
           (when (and (listp child)

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2013-11-30 09:25:31 +0000
+++ b/lisp/window.el    2013-12-01 22:33:13 +0000
@@ -1165,7 +1165,7 @@
                   0
                 window-min-width)))))
         (pixelwise
-         (max 
+         (max
           (+ (window-safe-min-size window nil t)
              (window-header-line-height window)
              (window-mode-line-height window))
@@ -2753,7 +2753,7 @@
 recover the necessary lines.  Return the number of lines that
 were recovered.
 
-Third argument PIXELWISE non-nil means to intepret DELTA as
+Third argument PIXELWISE non-nil means to interpret DELTA as
 pixels and return the number of pixels that were recovered.
 
 This function is called by the minibuffer window resizing
@@ -3189,7 +3189,7 @@
   (setq window (window-normalize-window window))
 
   (unless (or ignore-window-parameters
-             (eq (window-parameter window 'delete-window) t)) 
+             (eq (window-parameter window 'delete-window) t))
     ;; Handle atomicity.
     (when (window-parameter window 'window-atom)
       (setq window (window-atom-root window))))
@@ -4093,7 +4093,7 @@
 fringes and the scrollbar or a divider column.  Any other non-nil
 value for SIDE is currently handled like t (or `right').
 
-PIXELWISE, if non-nil, means to intepret SIZE pixelwise.
+PIXELWISE, if non-nil, means to interpret SIZE pixelwise.
 
 If the variable `ignore-window-parameters' is non-nil or the
 `split-window' parameter of WINDOW equals t, do not process any
@@ -7091,7 +7091,7 @@
                           (if pixelwise
                               (window-safe-min-pixel-width)
                             window-safe-min-width))
-                   ;; Preserve fringes, margines, scrollbars if present.
+                   ;; Preserve fringes, margins, scrollbars if present.
                    (window-min-size nil nil t pixelwise)))
                 (max-width
                  ;; Sanitize MAX-WIDTH.

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2013-11-14 01:52:18 +0000
+++ b/lwlib/ChangeLog   2013-12-01 22:33:13 +0000
@@ -396,7 +396,7 @@
        Add eventhandler for expose to expose_cb.  Remove creation of xft_draw.
        (create_pixmap_for_menu): New function.
        (remap_menubar): Pop down menus that aren't the same as in old_stack.
-       Set width, heigh, x, y on widget with XtVaSetValues.
+       Set width, height, x, y on widget with XtVaSetValues.
        Call create_pixmap_for_menu.
        Replace XUnmapWindow with XtPopdown.
        Remowe two last parameters to display_menu.

=== modified file 'src/ChangeLog.12'
--- a/src/ChangeLog.12  2013-10-24 07:04:01 +0000
+++ b/src/ChangeLog.12  2013-12-01 22:33:13 +0000
@@ -2840,7 +2840,7 @@
 2012-11-19  Daniel Colascione  <address@hidden>
 
        * w32fns.c (Fx_file_dialog):
-       (Fx_file_dialog): Accomodate rename of cygwin_convert_path* to
+       (Fx_file_dialog): Accommodate rename of cygwin_convert_path* to
        cygwin_convert_file_name*.
 
        * cygw32.c (Fcygwin_convert_path_to_windows, syms_of_cygw32):

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2013-11-29 01:22:40 +0000
+++ b/src/alloc.c       2013-12-01 22:33:13 +0000
@@ -4317,7 +4317,7 @@
 void dump_zombies (void) EXTERNALLY_VISIBLE;
 
 /* Array of objects that are kept alive because the C stack contains
-   a pattern that looks like a reference to them .  */
+   a pattern that looks like a reference to them.  */
 
 #define MAX_ZOMBIES 10
 static Lisp_Object zombies[MAX_ZOMBIES];

=== modified file 'src/blockinput.h'
--- a/src/blockinput.h  2013-09-20 15:34:36 +0000
+++ b/src/blockinput.h  2013-12-01 22:33:13 +0000
@@ -59,7 +59,7 @@
 extern void totally_unblock_input (void);
 extern void unblock_input_to (int);
 
-/* In critical section ? */
+/* In critical section?  */
 
 INLINE bool
 input_blocked_p (void)

=== modified file 'src/buffer.h'
--- a/src/buffer.h      2013-11-29 05:25:25 +0000
+++ b/src/buffer.h      2013-12-01 22:33:13 +0000
@@ -741,7 +741,7 @@
   Lisp_Object INTERNAL_FIELD (cursor_in_non_selected_windows);
 
   /* No more Lisp_Object beyond this point.  Except undo_list,
-     which is handled specially in Fgarbage_collect .  */
+     which is handled specially in Fgarbage_collect.  */
 
   /* This structure holds the coordinates of the buffer contents
      in ordinary buffers.  In indirect buffers, this is not used.  */

=== modified file 'src/charset.h'
--- a/src/charset.h     2013-09-20 15:34:36 +0000
+++ b/src/charset.h     2013-12-01 22:33:13 +0000
@@ -208,7 +208,7 @@
   unsigned min_code, max_code;
 
   /* Offset value used by macros CODE_POINT_TO_INDEX and
-      INDEX_TO_CODE_POINT. .  */
+      INDEX_TO_CODE_POINT.  */
   unsigned char_index_offset;
 
   /* Minimum and Maximum character codes of the charset.  If the

=== modified file 'src/chartab.c'
--- a/src/chartab.c     2013-11-08 07:28:21 +0000
+++ b/src/chartab.c     2013-12-01 22:33:13 +0000
@@ -1272,7 +1272,7 @@
 
 
 /* Encode VALUE as an element of char-table TABLE which adopts RUN-LENGTH
-   compression and contains numbers as elements .  */
+   compression and contains numbers as elements.  */
 
 static Lisp_Object
 uniprop_encode_value_numeric (Lisp_Object table, Lisp_Object value)

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2013-12-01 17:09:18 +0000
+++ b/src/dispextern.h  2013-12-01 22:33:13 +0000
@@ -1471,8 +1471,8 @@
    So maybe these checks should be removed and any clipping left to the
    window manager.  */
 
-/* Value is non-zero if window W wants a mode line and is large enough
-   to accomodate it.  */
+/* Value is true if window W wants a mode line and is large enough
+   to accommodate it.  */
 #define WINDOW_WANTS_MODELINE_P(W)                                     \
   (BUFFERP ((W)->contents)                                             \
    ? (!MINI_WINDOW_P (W)                                               \
@@ -1482,8 +1482,8 @@
       && WINDOW_PIXEL_HEIGHT (W) > WINDOW_FRAME_LINE_HEIGHT (W))       \
    : 0)
 
-/* Value is non-zero if window W wants a header line and is large enough
-   to accomodate it.  */
+/* Value is true if window W wants a header line and is large enough
+   to accommodate it.  */
 #define WINDOW_WANTS_HEADER_LINE_P(W)                                  \
      (BUFFERP ((W)->contents)                                          \
       ? (!MINI_WINDOW_P (W)                                            \

=== modified file 'src/frame.h'
--- a/src/frame.h       2013-11-30 09:25:31 +0000
+++ b/src/frame.h       2013-12-01 22:33:13 +0000
@@ -254,7 +254,7 @@
   int text_width, text_height;
 
   /* New text height and width for pending size change.  0 if no change
-     pending.  These value represent pixels or canoncial character units
+     pending.  These values represent pixels or canonical character units
      according to the value of new_pixelwise and correlate to the the
      text width/height of the frame.  */
   int new_width, new_height;
@@ -1170,7 +1170,7 @@
                              - FRAME_INTERNAL_BORDER_WIDTH (f))))
 
 /* Return the pixel width/height of frame F with a text size of
-   width/heigh.  */
+   width/height.  */
 
 #define FRAME_TEXT_TO_PIXEL_WIDTH(f, width)      \
   ((width)                                       \
@@ -1182,7 +1182,7 @@
   ((height) + 2 * FRAME_INTERNAL_BORDER_WIDTH (f))
 
 /* Return the text width/height of frame F with a pixel size of
-   width/heigh.  */
+   width/height.  */
 
 #define FRAME_PIXEL_TO_TEXT_WIDTH(f, width)      \
   ((width)                                       \

=== modified file 'src/lread.c'
--- a/src/lread.c       2013-11-27 06:15:06 +0000
+++ b/src/lread.c       2013-12-01 22:33:13 +0000
@@ -3537,7 +3537,7 @@
   return vector;
 }
 
-/* FLAG means check for ] to terminate rather than ) and .  */
+/* FLAG means check for ']' to terminate rather than ')' and '.'.  */
 
 static Lisp_Object
 read_list (bool flag, Lisp_Object readcharfun)

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-11-30 09:25:31 +0000
+++ b/src/nsterm.m      2013-12-01 22:33:13 +0000
@@ -1390,7 +1390,7 @@
       color_table->empty_indices = [[NSMutableSet alloc] init];
     }
 
-  /* do we already have this color ? */
+  /* Do we already have this color?  */
   for (i = 1; i < color_table->avail; i++)
     if (color_table->colors[i] && [color_table->colors[i] isEqual: color])
       return i;
@@ -7585,5 +7585,5 @@
 #else
   Fprovide (Qgnustep, Qnil);
 #endif
-  
+
 }

=== modified file 'src/print.c'
--- a/src/print.c       2013-11-30 09:25:31 +0000
+++ b/src/print.c       2013-12-01 22:33:13 +0000
@@ -1119,7 +1119,7 @@
    string (its text properties will be traced), or a symbol that has
    no obarray (this is for the print-gensym feature).
    The status fields of Vprint_number_table mean whether each object appears
-   more than once in OBJ: Qnil at the first time, and Qt after that .  */
+   more than once in OBJ: Qnil at the first time, and Qt after that.  */
 static void
 print_preprocess (Lisp_Object obj)
 {

=== modified file 'src/regex.c'
--- a/src/regex.c       2013-11-06 19:36:12 +0000
+++ b/src/regex.c       2013-12-01 22:33:13 +0000
@@ -5907,7 +5907,7 @@
            EXTRACT_NUMBER_AND_INCR (mcnt, p);
            /* Here, we discard `const', making re_match non-reentrant.  */
            p2 = (unsigned char*) p + mcnt;
-           /* Signedness doesn't matter since we only copy MCNT's bits .  */
+           /* Signedness doesn't matter since we only copy MCNT's bits.  */
            EXTRACT_NUMBER_AND_INCR (mcnt, p);
            DEBUG_PRINT ("  Setting %p to %d.\n", p2, mcnt);
            PUSH_NUMBER (p2, mcnt);

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2013-11-30 09:25:31 +0000
+++ b/src/w32fns.c      2013-12-01 22:33:13 +0000
@@ -6153,7 +6153,7 @@
     {
       /* PXW: Why do we do the pixel-to-cols conversion only if
         seen_reversed_p holds?  Don't we have to set other fields of
-        the window/frame stucture ?
+        the window/frame structure?
 
         w->total_cols and FRAME_TOTAL_COLS want the width in columns,
         not in pixels.  */

=== modified file 'src/window.c'
--- a/src/window.c      2013-11-30 16:25:51 +0000
+++ b/src/window.c      2013-12-01 22:33:13 +0000
@@ -1212,7 +1212,7 @@
     return ON_NOTHING;
 
   /* On vertical window divider (which prevails horizontal
-     dividers) ?  */
+     dividers)?  */
   if (!WINDOW_RIGHTMOST_P (w)
       && WINDOW_RIGHT_DIVIDER_WIDTH (w)
       && x >= right_x - WINDOW_RIGHT_DIVIDER_WIDTH (w)
@@ -1285,8 +1285,8 @@
      terminals, the vertical line's x coordinate is right_x.  */
   else if (!w->pseudo_window_p
           && !WINDOW_RIGHTMOST_P (w)
-          /* Why check ux if we are not the rightmost window ?  Also
-             shouldn't a pseudo window always be rightmost ?  */
+          /* Why check ux if we are not the rightmost window?  Also
+             shouldn't a pseudo window always be rightmost?  */
           && x > right_x - ux)
     return ON_VERTICAL_BORDER;
 
@@ -5844,12 +5844,12 @@
        From `frame-cols' down, the fields are ignored by the GC.  */
     /* We should be able to do without the following two.  */
     int frame_cols, frame_lines;
-    /* These two should get eventually replaced by their pixelized
+    /* These two should get eventually replaced by their pixel
        counterparts.  */
     int frame_menu_bar_lines, frame_tool_bar_lines;
     int frame_text_width, frame_text_height;
-    /* These are currently unused.  We need them as soon as we pixelize
-       them.  */
+    /* These are currently unused.  We need them as soon as we convert
+       to pixels.  */
     int frame_menu_bar_height, frame_tool_bar_height;
   };
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-12-01 17:09:18 +0000
+++ b/src/xdisp.c       2013-12-01 22:33:13 +0000
@@ -1907,8 +1907,7 @@
                           FRAME_COLUMN_WIDTH (f) - 1,
                           FRAME_LINE_HEIGHT (f) - 1);
 
-      /* PXW: Should we clip pixelized before converting to
-        columns/lines ?  */
+      /* PXW: Should we clip pixels before converting to columns/lines?  */
       if (!noclip)
        {
          if (pix_x < 0)
@@ -2814,7 +2813,7 @@
          && ((!NILP (Vtruncate_partial_width_windows)
               && !INTEGERP (Vtruncate_partial_width_windows))
              || (INTEGERP (Vtruncate_partial_width_windows)
-                 /* PXW: Shall we do something about this ?  */
+                 /* PXW: Shall we do something about this?  */
                  && (WINDOW_TOTAL_COLS (it->w)
                      < XINT (Vtruncate_partial_width_windows))))))
     it->line_wrap = TRUNCATE;
@@ -12072,7 +12071,7 @@
      F->desired_tool_bar_string in the tool-bar window of frame F.  */
   init_iterator (&it, w, -1, -1, temp_row, TOOL_BAR_FACE_ID);
   it.first_visible_x = 0;
-  /* PXW: Use FRAME_PIXEL_WIDTH (f) here ?  */
+  /* PXW: Use FRAME_PIXEL_WIDTH (f) here?  */
   it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f);
   reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1);
   it.paragraph_embedding = L2R;
@@ -13494,7 +13493,7 @@
               /* Make sure the cursor was last displayed
                  in this window.  Otherwise we have to reposition it.  */
 
-              /* PXW: Must be pixelized, probably.  */
+              /* PXW: Must be converted to pixels, probably.  */
               && 0 <= w->cursor.vpos
               && w->cursor.vpos < WINDOW_TOTAL_LINES (w))
        {
@@ -13588,7 +13587,7 @@
          if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf)
            {
              bool gcscrollbars
-               /* Only GC scollbars when we redisplay the whole frame.  */
+               /* Only GC scrollbars when we redisplay the whole frame.  */
                = f->redisplay || !REDISPLAY_SOME_P ();
              /* Mark all the scroll bars to be removed; we'll redeem
                 the ones we want when we redisplay their windows.  */
@@ -15046,7 +15045,7 @@
       if (! cursor_row_fully_visible_p (w, extra_scroll_margin_lines <= 1, 0)
          /* It's possible that the cursor is on the first line of the
             buffer, which is partially obscured due to a vscroll
-            (Bug#7537).  In that case, avoid looping forever . */
+            (Bug#7537).  In that case, avoid looping forever. */
          && extra_scroll_margin_lines < w->desired_matrix->nrows - 1)
        {
          clear_glyph_matrix (w->desired_matrix);
@@ -15101,7 +15100,7 @@
       /* If the line start is "too far" away from the window start,
          say it takes too much time to compute a new window start.  */
       if (CHARPOS (start_pos) - IT_CHARPOS (it)
-         /* PXW: Do we need upper bounds here ?  */
+         /* PXW: Do we need upper bounds here?  */
          < WINDOW_TOTAL_LINES (w) * WINDOW_TOTAL_COLS (w))
        {
          int min_distance, distance;
@@ -20728,7 +20727,7 @@
   eassert (!FRAME_WINDOW_P (f));
   init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID);
   it.first_visible_x = 0;
-  /* PXW: Use FRAME_PIXEL_WIDTH (f) here ?  */
+  /* PXW: Use FRAME_PIXEL_WIDTH (f) here?  */
   it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f);
 #elif defined (HAVE_X_WINDOWS) /* X without toolkit.  */
   if (FRAME_WINDOW_P (f))
@@ -20740,7 +20739,7 @@
       init_iterator (&it, menu_w, -1, -1, menu_w->desired_matrix->rows,
                     MENU_FACE_ID);
       it.first_visible_x = 0;
-      /* PXW: Use FRAME_PIXEL_WIDTH (f) here ?  */
+      /* PXW: Use FRAME_PIXEL_WIDTH (f) here?  */
       it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f);
     }
   else

=== modified file 'src/xrdb.c'
--- a/src/xrdb.c        2013-11-14 01:52:18 +0000
+++ b/src/xrdb.c        2013-12-01 22:33:13 +0000
@@ -179,7 +179,7 @@
       else
        next = p, next_len = 1;
 
-      /* Do we have room for this component followed by a '\0' ?  */
+      /* Do we have room for this component followed by a '\0'?  */
       if (path_size - path_len <= next_len)
        {
          if (min (PTRDIFF_MAX, SIZE_MAX) / 2 - 1 - path_len < next_len)

=== modified file 'test/automated/reftex-tests.el'
--- a/test/automated/reftex-tests.el    2013-11-29 10:33:31 +0000
+++ b/test/automated/reftex-tests.el    2013-12-01 22:33:13 +0000
@@ -99,7 +99,7 @@
   ;; MS-Windows into their long file-name equivalents, which is
   ;; necessary for the 'equal' and 'string=' comparisons below.  This
   ;; also resolves any symlinks, which cannot be bad for the same
-  ;; reason.  (An alternatrive solution would be to use file-equal-p,
+  ;; reason.  (An alternative solution would be to use file-equal-p,
   ;; but I'm too lazy to do that, as one of the tests compares a
   ;; list.)
   (let* ((temp-dir (file-truename (make-temp-file "reftex-parse" 'dir)))


reply via email to

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