emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] emacs-25 a528a60: Spelling fixes


From: Paul Eggert
Subject: [Emacs-diffs] emacs-25 a528a60: Spelling fixes
Date: Mon, 25 Jan 2016 16:09:19 +0000

branch: emacs-25
commit a528a60f48f6b939c5014c96d3445de13d2ed243
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Spelling fixes
---
 doc/emacs/anti.texi          |    2 +-
 doc/lispref/windows.texi     |    2 +-
 lisp/emacs-lisp/pcase.el     |    2 +-
 lisp/org/ChangeLog.1         |    2 +-
 lisp/progmodes/antlr-mode.el |    2 +-
 lisp/progmodes/cc-engine.el  |    6 +++---
 lisp/xwidget.el              |    2 +-
 src/nsterm.m                 |    2 +-
 src/xwidget.c                |    8 ++++----
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index ae13ae0..ece4d94 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -197,7 +197,7 @@ for removing the whole bidi support when downgrading to 
Emacs 23.
 @item
 Horizontal scroll bars are no longer supported.  Enlarge your windows
 and frames instead, or use @code{truncate-lines} and the automatic
-horizontal scrolling of text that Emacs had since time immemoriam.
+horizontal scrolling of text that Emacs had since time immemorial.
 
 @item
 Emacs is again counting the height of a frame's menu and its tool bar
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index fee4b0c..ca756e3 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1579,7 +1579,7 @@ combination limit of @var{W4} (the parent window of 
@var{W6} and
 
 Alternatively, the problems sketched above can be avoided by always
 resizing all windows in the same combination whenever one of its windows
-is split or deleted.  This also permits spliting windows that would be
+is split or deleted.  This also permits splitting windows that would be
 otherwise too small for such an operation.
 
 @defopt window-combination-resize
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 549ee96..7be997e 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -117,7 +117,7 @@ two element list, binding its elements to symbols named 
`foo' and
 
 A significant difference from `cl-destructuring-bind' is that, if
 a pattern match fails, the next case is tried until either a
-succesful match is found or there are no more cases.
+successful match is found or there are no more cases.
 
 Another difference is that pattern elements may be backquoted,
 meaning they must match exactly: The pattern \\='(foo bar)
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index d81e44d..8c118ec 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -32528,7 +32528,7 @@
        (org-export-normalize-links)
        (org-export-concatenate-multiline-links)
        (org-export-concatenate-multiline-emphasis): New functions,
-       obtained from spliting the export preprocessor.
+       obtained from splitting the export preprocessor.
 
        * org-table.el (org-table-recalculate): Improve error message if
        the row number is invalid.
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index f33609c..ee81add 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -537,7 +537,7 @@ corresponding kind, i.e., looks like \(OPTION-DEF...).
 Each OPTION-DEF looks like \(OPTION-NAME EXTRA-FN VALUE-SPEC...) which
 defines a file/grammar/rule/subrule option with name OPTION-NAME.  The
 OPTION-NAMEs are used for the creation of the \"Insert XXX Option\"
-submenus, see `antlr-options-use-submenus', and to allow the insersion
+submenus, see `antlr-options-use-submenus', and to allow the insertion
 of the option name with completion when using \\[antlr-insert-option].
 
 If EXTRA-FN is a function, it is called at different phases of the
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 815bd72..b75d667 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8284,8 +8284,8 @@ comment at the start of cc-engine.el for more info."
             before-lparen after-rparen
             (here (point))
             (pp-count-out 20)  ; Max number of paren/brace constructs before
-                               ; we give up
-            ids              ; List of identifiers in the parenthesised list.
+                               ; we give up.
+            ids              ; List of identifiers in the parenthesized list.
             id-start after-prec-token decl-or-cast decl-res
             c-last-identifier-range identifier-ok)
        (narrow-to-region low-lim (or macro-end (point-max)))
@@ -8310,7 +8310,7 @@ comment at the start of cc-engine.el for more info."
        ;; {
        ;;
        ;; Additionally, for a knr list to be recognized:
-       ;; o - The identifier of each deeclarator up to and including the
+       ;; o - The identifier of each declarator up to and including the
        ;;   one "near" point must be contained in the arg list.
 
        (catch 'knr
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index f184eb3..ebd79f2 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -491,7 +491,7 @@ Argument H height."
 (defun xwidget-webkit-execute-script-rv (xw script &optional default)
   "Same as 'xwidget-webkit-execute-script' but but with return value.
 XW is the webkit instance.  SCRIPT is the script to execute.
-DEFAULT is the defaultreturn value."
+DEFAULT is the default return value."
   ;; Notice the ugly "title" hack.  It is needed because the Webkit
   ;; API at the time of writing didn't support returning values.  This
   ;; is a wrapper for the title hack so it's easy to remove should
diff --git a/src/nsterm.m b/src/nsterm.m
index 860c55d..19083ef 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1170,7 +1170,7 @@ ns_clip_to_row (struct window *w, struct glyph_row *row,
       // GNUstep doesn't provide named images.  This was reported in
       // 2011, see https://savannah.gnu.org/bugs/?33396
       //
-      // As a drop in replacment, a semi tranparent gray square is used.
+      // As a drop in replacement, a semitransparent gray square is used.
       self.image = [[NSImage alloc] initWithSize:NSMakeSize(32, 32)];
       [self.image lockFocus];
       [[NSColor colorForEmacsRed:0.5 green:0.5 blue:0.5 alpha:0.5] set];
diff --git a/src/xwidget.c b/src/xwidget.c
index 91a92c0..9450bdf 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -393,7 +393,7 @@ webkit_mime_type_policy_typedecision_requested_cb
 {
   /* This function makes webkit send a download signal for all unknown
      mime types.  TODO: Defer the decision to Lisp, so that it's
-     possible to make Emacs handle teext mime for instance.xs.  */
+     possible to make Emacs handle mime text for instance.  */
   if (!webkit_web_view_can_show_mime_type (webView, mimetype))
     {
       webkit_web_policy_decision_download (policy_decision);
@@ -594,7 +594,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
          WINDOW_BOTTOM_EDGE_Y (s->w) - WINDOW_MODE_LINE_HEIGHT (s->w) - y);
   clip_top = max (0, WINDOW_TOP_EDGE_Y (s->w) - y);
 
-  /* We are conserned with movement of the onscreen area.  The area
+  /* We are concerned with movement of the onscreen area.  The area
      might sit still when the widget actually moves.  This happens
      when an Emacs window border moves across a widget window.  So, if
      any corner of the outer widget clipping window moves, that counts
@@ -615,7 +615,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
   /* Clip the widget window if some parts happen to be outside
      drawable area.  An Emacs window is not a gtk window.  A gtk window
      covers the entire frame.  Clipping might have changed even if we
-     havent actualy moved, we try figure out when we need to reclip
+     haven't actually moved; try to figure out when we need to reclip
      for real.  */
   if (xv->clip_right != clip_right
       || xv->clip_bottom != clip_bottom
@@ -1132,7 +1132,7 @@ xwidget_end_redisplay (struct window *w, struct 
glyph_matrix *matrix)
      not in the desired matrix.
 
      This only takes care of xwidgets in active windows.  If a window
-     goes away from screen xwidget views wust be deleted.
+     goes away from the screen, xwidget views must be deleted.
 
      dump_glyph_matrix (matrix, 2);  */
   for (i = 0; i < matrix->nrows; ++i)



reply via email to

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