From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 19 Nov 2017 08:19:51 +0000 (-0800)
Subject: Spelling fixes
X-Git-Tag: emacs-26.0.91~288
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b2518ac7501810b49e078e55c07bf6740c27dec4;p=emacs.git

Spelling fixes

* lisp/help-fns.el (help-fns--analyze-function):
Rename from help-fns--analyse-function.
All uses changed.
---

diff --git a/ChangeLog.3 b/ChangeLog.3
index e7831a37aac..17f18c0fad3 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -38322,7 +38322,7 @@
 	Automatically detect whether .h file is C or C++
 
 	* lisp/progmodes/cc-mode.el (c-or-c++-mode): A new function which
-	analyses contents of the buffer to determine whether it looks like C++
+	analyzes contents of the buffer to determine whether it looks like C++
 	source code and based on that enables c-mode or c++-mode.
 	(c-or-c++-mode--regexp): Regular expression which, when matches
 	a buffer, signals file is C++.
diff --git a/etc/NEWS b/etc/NEWS
index f79c2cbc8ea..6da4ab93b13 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1155,9 +1155,8 @@ branch-related commands on a keymap bound to 'B'.
 
 ---
 *** Opening a .h file will turn C or C++ mode depending on language used.
-This is done with the help of 'c-or-c++-mode' function which analyses
-contents of the buffer to determine whether it's a C or C++ source
-file.
+This is done with the help of the 'c-or-c++-mode' function, which
+analyzes buffer contents to infer whether it's a C or C++ source file.
 
 ---
 ** New option 'cpp-message-min-time-interval' to allow user control
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index cae0247a542..7f135e52ee3 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -560,7 +560,7 @@ FILE is the file where FUNCTION was probably defined."
             (setq short rel))))
     short))
 
-(defun help-fns--analyse-function (function)
+(defun help-fns--analyze-function (function)
   ;; FIXME: Document/explain the differences between FUNCTION,
   ;; REAL-FUNCTION, DEF, and REAL-DEF.
   "Return information about FUNCTION.
@@ -602,7 +602,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)."
 (defun help-fns-function-description-header (function)
   "Print a line describing FUNCTION to `standard-output'."
   (pcase-let* ((`(,_real-function ,def ,aliased ,real-def)
-                (help-fns--analyse-function function))
+                (help-fns--analyze-function function))
                (file-name (find-lisp-object-file-name function (if aliased 'defun
                                                                  def)))
                (beg (if (and (or (byte-code-function-p def)
@@ -692,7 +692,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)."
   (terpri)(terpri)
 
   (pcase-let* ((`(,real-function ,def ,_aliased ,real-def)
-                (help-fns--analyse-function function))
+                (help-fns--analyze-function function))
                (doc-raw (condition-case nil
                             ;; FIXME: Maybe `documentation' should return nil
                             ;; for invalid functions i.s.o. signaling an error.
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index f74e931a8bb..22dea039cd1 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1859,7 +1859,7 @@ Key bindings:
 
 ;;;###autoload
 (defun c-or-c++-mode ()
-  "Analyse buffer and enable either C or C++ mode.
+  "Analyze buffer and enable either C or C++ mode.
 
 Some people and projects use .h extension for C++ header files
 which is also the one used for C header files.  This makes