[Emacs-diffs] master c92dbd6: Spelling fixes

[Paul Eggert]

branch: master
commit c92dbd6d0c234ff993acb0a095c024593bc185c8
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Spelling fixes
    
    * lisp/net/soap-inspect.el (soap-inspect-xs-simple-type):
    Fix misspelling in output.
---
 ChangeLog.2                   |    4 ++--
 doc/lispref/variables.texi    |    2 +-
 lisp/ChangeLog.17             |   10 +++++-----
 lisp/emacs-lisp/cl-generic.el |    2 +-
 lisp/net/soap-client.el       |    6 +++---
 lisp/net/soap-inspect.el      |    2 +-
 lisp/progmodes/project.el     |    2 +-
 lisp/vc/vc.el                 |    2 +-
 src/alloc.c                   |    2 +-
 src/nsterm.h                  |    4 ++--
 src/nsterm.m                  |   14 +++++++-------
 src/window.c                  |    2 +-
 test/etags/cp-src/clheir.hpp  |    2 +-
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ChangeLog.2 b/ChangeLog.2
index a915adb..3636e38 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -612,7 +612,7 @@
 
 2015-10-29  Stefan Monnier  <address@hidden>
 
-       * lisp/emacs-lisp/cl-generic.el: Accomodate future changes.
+       * lisp/emacs-lisp/cl-generic.el: Accommodate future changes.
        (cl--generic-generalizer): Add `name' field.
        (cl-generic-make-generalizer): Add corresponding `name' argument.
        (cl-generic-define-generalizer): New macro.
@@ -4418,7 +4418,7 @@
 2015-09-20  Stefan Monnier  <address@hidden>
 
        * lisp/progmodes/prolog.el: Improve handling of if/then/else.
-       (prolog-smie-rules): Accomodate standard if/then/else special
+       (prolog-smie-rules): Accommodate standard if/then/else special
        indentation.
        (prolog-mode): Add . to electric-indent-chars.
        (prolog-electric--if-then-else): Re-indent the line before adding space
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index f49d506..5a2cae0 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1790,7 +1790,7 @@ specify different values for the same variable, the file 
sorted after
 will override the value of the previous file (for instance, values in
 @file{.dir-locals2.el} override those in @file{.dir-locals.el}).  Note
 that, because of how lexicographic order works, values in
address@hidden are overriden by values in @file{.dir-locals2.el}.
address@hidden are overridden by values in @file{.dir-locals2.el}.
 This can be avoided by using @file{.dir-locals02.el} instead.
 @end defvr
 
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 8a255d7..d717a4d 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -4146,7 +4146,7 @@
 2014-12-14  Steve Purcell  <address@hidden>  (tiny change)
 
        * emacs-lisp/package.el (package-menu-mode): Use an extra column
-       for the "Version" column, to accomodate date-and-time-based versions.
+       for the "Version" column, to accommodate date-and-time-based versions.
 
 2014-12-14  Cameron Desautels  <address@hidden>
 
@@ -8700,9 +8700,9 @@
        (python-shell-prompt-detect)
        (python-shell-prompt-validate-regexps): New functions.
        (python-shell-prompt-set-calculated-regexps): New function.
-       (inferior-python-mode): Use it.  Also honor overriden
+       (inferior-python-mode): Use it.  Also honor overridden
        python-shell-interpreter and python-shell-interpreter-args.
-       (python-shell-make-comint): Honor overriden
+       (python-shell-make-comint): Honor overridden
        python-shell-interpreter and python-shell-interpreter-args.
        (python-shell-get-or-create-process): Make it testable by allowing
        to call run-python non-interactively.
@@ -10975,9 +10975,9 @@
 
        * faces.el (face-spec-recalc): Apply X resources only after the
        defface spec has been applied. Thus, X resources are no longer
-       overriden by the defface spec which also fixes issues on win32 where
+       overridden by the defface spec which also fixes issues on win32 where
        the toolbar coloring was wrong because it is set through X resources
-       and was (wrongfully) overriden.  (Bug#16694)
+       and was (wrongfully) overridden.  (Bug#16694)
 
 2014-04-30  Stefan Monnier  <address@hidden>
 
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index aae517e..9e6102c 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -268,7 +268,7 @@ This macro can only be used within the lexical scope of a 
cl-generic method."
 
 (defmacro cl-generic-define-context-rewriter (name args &rest body)
   "Define a special kind of context named NAME.
-Whenever a context specializer of the form (NAME . ACTUALS) appears,
+Whenever a context specializer of the form (NAME . ARGS) appears,
 the specializer used will be the one returned by BODY."
   (declare (debug (&define name lambda-list def-body)) (indent defun))
   `(eval-and-compile
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index 264a39c..8317325 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -390,7 +390,7 @@ binding) but the same name."
 
 ;; SOAP WSDL documents use XML Schema to define the types that are part of the
 ;; message exchange.  We include here an XML schema model with a parser and
-;; serializer/deserialiser.
+;; serializer/deserializer.
 
 (defstruct (soap-xs-type (:include soap-element))
   id
@@ -710,7 +710,7 @@ This is a specialization of `soap-decode-type' for
 (defun soap-xs-element-type (element)
   "Retrieve the type of ELEMENT.
 This is normally stored in the TYPE^ slot, but if this element
-contains a reference, we retrive the type of the reference."
+contains a reference, retrieve the type of the reference."
   (if (soap-xs-element-reference element)
       (soap-xs-element-type (soap-xs-element-reference element))
     (soap-xs-element-type^ element)))
@@ -1989,7 +1989,7 @@ This is a specialization of `soap-decode-type' for
   )
 
 (defun soap-make-wsdl (origin)
-  "Create a new WSDL document, loaded from ORIGIN, and intialize it."
+  "Create a new WSDL document, loaded from ORIGIN, and initialize it."
   (let ((wsdl (soap-make-wsdl^ :origin origin)))
 
     ;; Add the XSD types to the wsdl document
diff --git a/lisp/net/soap-inspect.el b/lisp/net/soap-inspect.el
index f6c7da6..b01e2bf 100644
--- a/lisp/net/soap-inspect.el
+++ b/lisp/net/soap-inspect.el
@@ -334,7 +334,7 @@ soap-xs-attribute-group, in the current buffer."
       (insert "\t")
       (soap-insert-describe-button type)))
   (when (soap-xs-simple-type-enumeration type)
-    (insert "\nEnumeraton values: ")
+    (insert "\nEnumeration values: ")
     (dolist (e (soap-xs-simple-type-enumeration type))
       (insert "\n\t")
       (pp e)))
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 295e544..398339e 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -108,7 +108,7 @@ Most often it's just one directory, which contains the 
project
 file and everything else in the project.  But in more advanced
 configurations, a project can span multiple directories.
 
-The rule of tumb for whether to include a directory here, and not
+The rule of thumb for whether to include a directory here, and not
 in `project-library-roots', is whether its contents are meant to
 be edited together with the rest of the project.
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index efd816b..178b5f0 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2071,7 +2071,7 @@ changes from the current branch."
 ;;;###autoload
 (defun vc-message-unresolved-conflicts (filename)
   "Display a message indicating unresolved conflicts in FILENAME."
-  ;; This enables all VC backends to give a standard, recognizeable
+  ;; This enables all VC backends to give a standard, recognizable
   ;; conflict message that indicates which file is conflicted.
   (message "There are unresolved conflicts in %s" filename))
 
diff --git a/src/alloc.c b/src/alloc.c
index 81d644a..bee7cd1 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5346,7 +5346,7 @@ compact_font_cache_entry (Lisp_Object entry)
                 }
               if (CONSP (objlist))
                {
-                 /* Foiund a marked font, bail out.  */
+                 /* Found a marked font, bail out.  */
                  break;
                }
             }
diff --git a/src/nsterm.h b/src/nsterm.h
index 3fb8cfc..1b330f0 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -126,7 +126,7 @@ nsterm.m  : 6718: [ 4453]  | | | | +->> (X:0 Y:0)/(W:1600 
H:1177)
 
    Here, "ns_fullscreen_hook" calls "handleFS", which is turn calls
    "performZoom".  This function calls "[super performZoom]", which
-   isn't annoted (so it doesn't show up in the trace).  However, it
+   isn't annotated (so it doesn't show up in the trace).  However, it
    calls "zoom" which is annotated so it is part of the call trace.
    Later, the method "windowWillUseStandardFrame" and the function
    "setFSValue" are called.  The lines with "+---" contain extra
@@ -230,7 +230,7 @@ void nstrace_leave(int *);
 
 /* Function enter macros.
 
-   NSTRACE (fmt, ...) -- Enable trace output in curent block
+   NSTRACE (fmt, ...) -- Enable trace output in current block
                          (typically a function).  Accepts printf-style
                          arguments.
 
diff --git a/src/nsterm.m b/src/nsterm.m
index fabfa29..5e6c748 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6353,7 +6353,7 @@ not_in_argv (NSString *arg)
 
   /* Restrict the new size to the text gird.
 
-     Don't restict the width if the user only adjusted the height, and
+     Don't restrict the width if the user only adjusted the height, and
      vice versa.  (Without this, the frame would shrink, and move
      slightly, if the window was resized by dragging one of its
      borders.) */
@@ -7591,7 +7591,7 @@ not_in_argv (NSString *arg)
 /* Constrain size and placement of a frame.
 
    By returning the original "frameRect", the frame is not
-   contrained. This can lead to unwanted situations where, for
+   constrained. This can lead to unwanted situations where, for
    example, the menu bar covers the frame.
 
    The default implementation (accessed using "super") constrains the
@@ -7647,7 +7647,7 @@ not_in_argv (NSString *arg)
 
 #if 0
   // Native zoom done using the standard zoom animation.  Size of the
-  // resulting frame reduced to accomodate the Dock and, if present,
+  // resulting frame reduced to accommodate the Dock and, if present,
   // the menu-bar.
   [super zoom:sender];
 
@@ -7661,8 +7661,8 @@ not_in_argv (NSString *arg)
   //
   // This works for all practical purposes.  (The only minor oddity is
   // when transiting from full-height frame to a maximized, the
-  // animation reduces the height of the frame slighty (to the 4
-  // pixels needed to accomodate the Doc) before it snaps back into
+  // animation reduces the height of the frame slightly (to the 4
+  // pixels needed to accommodate the Doc) before it snaps back into
   // full height.  The user would need a very trained eye to spot
   // this.)
   NSScreen * screen = [self screen];
@@ -7702,8 +7702,8 @@ not_in_argv (NSString *arg)
         }
     }
 #else
-  // Non-native zoom which is done instantaneous.  The resulting frame
-  // covert the entire scrren, except the menu-bar, if present.
+  // Non-native zoom which is done instantaneously.  The resulting frame
+  // covers the entire screen, except the menu-bar, if present.
   NSScreen * screen = [self screen];
   if (screen != nil)
     {
diff --git a/src/window.c b/src/window.c
index 7c95ff9..0ac76d4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -210,7 +210,7 @@ wset_update_mode_line (struct window *w)
 {
   /* If this window is the selected window on its frame, set the
      global variable update_mode_lines, so that x_consider_frame_title
-     will consider this frame's title for rtedisplay.  */
+     will consider this frame's title for redisplay.  */
   Lisp_Object fselected_window = XFRAME (WINDOW_FRAME (w))->selected_window;
 
   if (WINDOWP (fselected_window) && XWINDOW (fselected_window) == w)
diff --git a/test/etags/cp-src/clheir.hpp b/test/etags/cp-src/clheir.hpp
index a924563..55d9122 100644
--- a/test/etags/cp-src/clheir.hpp
+++ b/test/etags/cp-src/clheir.hpp
@@ -17,7 +17,7 @@ public:
     generic_object();  // enter generic_object into ObjectRegistry
     // We never copy generic_objects, so we don't need a copy constructor.
     ~generic_object(void);  // delete from ObjectRegistry
-    // Simulation steps, accomodate different kinds of time
+    // Simulation steps, accommodate different kinds of time
     virtual void compute_next_state(void) { }
     virtual void step(void) { }
     };