aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2017-11-19 00:19:51 -0800
committerPaul Eggert2017-11-19 00:21:09 -0800
commitb2518ac7501810b49e078e55c07bf6740c27dec4 (patch)
tree1c04f5b0d469d991e6b32d60954c742ca89ff524
parent18b235941109ab9e7a405cbe950886c97e897e11 (diff)
downloademacs-b2518ac7501810b49e078e55c07bf6740c27dec4.tar.gz
emacs-b2518ac7501810b49e078e55c07bf6740c27dec4.zip
Spelling fixes
* lisp/help-fns.el (help-fns--analyze-function): Rename from help-fns--analyse-function. All uses changed.
-rw-r--r--ChangeLog.32
-rw-r--r--etc/NEWS5
-rw-r--r--lisp/help-fns.el6
-rw-r--r--lisp/progmodes/cc-mode.el2
4 files changed, 7 insertions, 8 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3
index e7831a37aac..17f18c0fad3 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -38322,7 +38322,7 @@
38322 Automatically detect whether .h file is C or C++ 38322 Automatically detect whether .h file is C or C++
38323 38323
38324 * lisp/progmodes/cc-mode.el (c-or-c++-mode): A new function which 38324 * lisp/progmodes/cc-mode.el (c-or-c++-mode): A new function which
38325 analyses contents of the buffer to determine whether it looks like C++ 38325 analyzes contents of the buffer to determine whether it looks like C++
38326 source code and based on that enables c-mode or c++-mode. 38326 source code and based on that enables c-mode or c++-mode.
38327 (c-or-c++-mode--regexp): Regular expression which, when matches 38327 (c-or-c++-mode--regexp): Regular expression which, when matches
38328 a buffer, signals file is C++. 38328 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'.
1155 1155
1156--- 1156---
1157*** Opening a .h file will turn C or C++ mode depending on language used. 1157*** Opening a .h file will turn C or C++ mode depending on language used.
1158This is done with the help of 'c-or-c++-mode' function which analyses 1158This is done with the help of the 'c-or-c++-mode' function, which
1159contents of the buffer to determine whether it's a C or C++ source 1159analyzes buffer contents to infer whether it's a C or C++ source file.
1160file.
1161 1160
1162--- 1161---
1163** New option 'cpp-message-min-time-interval' to allow user control 1162** 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."
560 (setq short rel)))) 560 (setq short rel))))
561 short)) 561 short))
562 562
563(defun help-fns--analyse-function (function) 563(defun help-fns--analyze-function (function)
564 ;; FIXME: Document/explain the differences between FUNCTION, 564 ;; FIXME: Document/explain the differences between FUNCTION,
565 ;; REAL-FUNCTION, DEF, and REAL-DEF. 565 ;; REAL-FUNCTION, DEF, and REAL-DEF.
566 "Return information about FUNCTION. 566 "Return information about FUNCTION.
@@ -602,7 +602,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)."
602(defun help-fns-function-description-header (function) 602(defun help-fns-function-description-header (function)
603 "Print a line describing FUNCTION to `standard-output'." 603 "Print a line describing FUNCTION to `standard-output'."
604 (pcase-let* ((`(,_real-function ,def ,aliased ,real-def) 604 (pcase-let* ((`(,_real-function ,def ,aliased ,real-def)
605 (help-fns--analyse-function function)) 605 (help-fns--analyze-function function))
606 (file-name (find-lisp-object-file-name function (if aliased 'defun 606 (file-name (find-lisp-object-file-name function (if aliased 'defun
607 def))) 607 def)))
608 (beg (if (and (or (byte-code-function-p def) 608 (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)."
692 (terpri)(terpri) 692 (terpri)(terpri)
693 693
694 (pcase-let* ((`(,real-function ,def ,_aliased ,real-def) 694 (pcase-let* ((`(,real-function ,def ,_aliased ,real-def)
695 (help-fns--analyse-function function)) 695 (help-fns--analyze-function function))
696 (doc-raw (condition-case nil 696 (doc-raw (condition-case nil
697 ;; FIXME: Maybe `documentation' should return nil 697 ;; FIXME: Maybe `documentation' should return nil
698 ;; for invalid functions i.s.o. signaling an error. 698 ;; 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:
1859 1859
1860;;;###autoload 1860;;;###autoload
1861(defun c-or-c++-mode () 1861(defun c-or-c++-mode ()
1862 "Analyse buffer and enable either C or C++ mode. 1862 "Analyze buffer and enable either C or C++ mode.
1863 1863
1864Some people and projects use .h extension for C++ header files 1864Some people and projects use .h extension for C++ header files
1865which is also the one used for C header files. This makes 1865which is also the one used for C header files. This makes