diff options
author | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /lisp/cedet | |
parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz |
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
Diffstat (limited to 'lisp/cedet')
-rw-r--r-- | lisp/cedet/ede/cpp-root.el | 2 | ||||
-rw-r--r-- | lisp/cedet/ede/files.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/analyze.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/dep.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/lex.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/util-modes.el | 2 | ||||
-rw-r--r-- | lisp/cedet/srecode/el.el | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index 76afe9b9bfd..bcefb4e340c 100644 --- a/lisp/cedet/ede/cpp-root.el +++ b/lisp/cedet/ede/cpp-root.el @@ -137,7 +137,7 @@ ;; Need a way to reconfigure a project, and have it affect all open buffers. ;; From Tobias Gerdin: ;; -;; >>3) Is there any way to refresh a ede-cpp-root-project dynamically? I have +;; >>3) Is there any way to refresh an ede-cpp-root-project dynamically? I have ;; >>some file open part of the project, fiddle with the include paths and would ;; >>like the open buffer to notice this when I re-evaluate the ;; >>ede-cpp-root-project constructor. diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index 36ec7a1d894..c95402e365d 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el @@ -25,7 +25,7 @@ ;; ;; Basic Model: ;; -;; A directory belongs to a project if a ede-project-autoload structure +;; A directory belongs to a project if an ede-project-autoload structure ;; matches your directory. ;; ;; A toplevel project is one where there is no active project above 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...) ;; { diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el index f5f1265ccda..ff9e1d53f91 100644 --- a/lisp/cedet/srecode/el.el +++ b/lisp/cedet/srecode/el.el @@ -24,7 +24,7 @@ ;; Emacs Lisp specific handlers. To use these handlers in your ;; template, add the :name part to your template argument list. ;; -;; Error if not in a Emacs Lisp mode +;; Error if not in an Emacs Lisp mode ;;; Code: |