Merge from origin/emacs-26

e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles

4 files changed, 4 insertions, 4 deletions

diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 8f3d5b2b1cf..7c9f102951d 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -121,7 +121,7 @@ See `semantic-analyze-scoped-tags' for details.")
 	   :type buffer
 	   :documentation "The buffer this context is derived from.")
    (errors :initarg :errors
-	   :documentation "Any errors thrown an caught during analysis.")
+	   :documentation "Any errors thrown and caught during analysis.")
    )
   "Base analysis data for any context.")
 
diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el
index 6f1bde02091..640884d014b 100644
--- a/lisp/cedet/semantic/dep.el
+++ b/lisp/cedet/semantic/dep.el
@@ -67,7 +67,7 @@ For mode authors, use
 `defcustom-mode-local-semantic-dependency-system-include-path'
 to create a mode-specific variable to control this.
 
-When searching for a file associated with a name found in an tag of
+When searching for a file associated with a name found in a tag of
 class include, this path will be inspected for includes of type
 `system'.  Some include tags are agnostic to this setting and will
 check both the project and system directories.")
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index 0403e5e7f20..0cc296f09da 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -408,7 +408,7 @@ TYPE name does not exist.  Otherwise signal an error."
 SPECS must be a list of (TYPE . TOKENS) elements, where:
 
   TYPE is the name of the type symbol to define.
-  TOKENS is an list of (TOKSYM . MATCHER) elements, where:
+  TOKENS is a list of (TOKSYM . MATCHER) elements, where:
 
     TOKSYM is any lexical token symbol.
     MATCHER is a string or regexp a text must match to be a such
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index 6374a0cb089..54c9578773a 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -782,7 +782,7 @@ If there is no function, disable the header line."
 		  (goto-char (semantic-tag-start tag))
 		  ;; Klaus Berndl <klaus.berndl@sdm.de>:
 		  ;; goto the tag name; this is especially needed for languages
-		  ;; like c++ where a often used style is like:
+		  ;; like c++ where an often used style is like:
 		  ;;     void
 		  ;;     ClassX::methodM(arg1...)
 		  ;;     {