summaryrefslogtreecommitdiff
path: root/lisp/cedet
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/cedet')
-rw-r--r--lisp/cedet/ede/files.el2
-rw-r--r--lisp/cedet/ede/proj-shared.el4
-rw-r--r--lisp/cedet/semantic/grammar.el6
-rw-r--r--lisp/cedet/semantic/lex.el4
-rw-r--r--lisp/cedet/semantic/senator.el4
5 files changed, 10 insertions, 10 deletions
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 6179d304464..f17dfd85fdf 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -249,7 +249,7 @@ Do this whenever a new project is created, as opposed to loaded."
"Return a project description object if DIR has a project.
Optional argument FORCE means to ignore a hash-hit of 'nomatch.
This depends on an up to date `ede-project-class-files' variable.
-Any directory that contains the file .ede-ignore will allways
+Any directory that contains the file .ede-ignore will always
return nil."
(when (not (file-exists-p (expand-file-name ".ede-ignore" dir)))
(let* ((dirtest (expand-file-name dir))
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index ec514194e33..4e233f56a12 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -61,7 +61,7 @@ Use ldlibs to add addition libraries.")
; "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^")
; )
; :commands '("$(C_SHARED_LINK) %s")
- ;; @TODO - addative modification of autoconf.
+ ;; @TODO - additive modification of autoconf.
:autoconf '("AC_PROG_LIBTOOL")
)
"Compiler for C sourcecode.")
@@ -108,7 +108,7 @@ Use ldlibs to add addition libraries.")
:variables '(("CXX_SHARED" . "g++")
("CXX_SHARED_COMPILE" .
"$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
- ;; @TODO - addative modification of autoconf.
+ ;; @TODO - additive modification of autoconf.
:autoconf '("AC_PROG_LIBTOOL")
)
"Compiler for C sourcecode.")
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 1d1184e534f..98b1ab55c32 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -104,10 +104,10 @@ It ignores whitespaces, newlines and comments."
;; regexp match semicolons inside strings!
semantic-lex-ignore-comments
;; Must detect prefixed list before punctuation because prefix chars
- ;; are also punctuations!
+ ;; are also punctuation!
semantic-grammar-wy--<qlist>-sexp-analyzer
- ;; Must detect punctuations after comments because the semicolon can
- ;; be a punctuation or a comment start!
+ ;; Must detect punctuation after comments because the semicolon can
+ ;; be punctuation or a comment start!
semantic-grammar-wy--<punctuation>-string-analyzer
semantic-grammar-wy--<block>-block-analyzer
semantic-grammar-wy--<sexp>-sexp-analyzer)
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index fca367ecb8c..ba43ba657a1 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -165,7 +165,7 @@
;;
;; %type <punctuation> syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
;;
-;; ;; Some punctuations based on the type defines above
+;; ;; Some punctuation based on the type defines above
;;
;; %token <punctuation> NOT "!"
;; %token <punctuation> NOTEQ "!="
@@ -1313,7 +1313,7 @@ and number formats."
(define-lex-analyzer semantic-lex-punctuation-type
"Detect and create a punctuation type token.
-Recognized punctuations are defined in the current table of lexical
+Recognized punctuation is defined in the current table of lexical
types, as the value of the `punctuation' token type."
(and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+")
(let* ((key (match-string 0))
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 5399d4d5649..b4618d1c18f 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -179,8 +179,8 @@ source."
(goto-char (semantic-tag-start tag))
(when (re-search-forward (concat
;; The tag name is expected to be
- ;; between word delimiters, whitespaces,
- ;; or punctuations.
+ ;; between word delimiters, whitespace,
+ ;; or punctuation.
"\\(\\<\\|\\s-+\\|\\s.\\)"
(regexp-quote name)
"\\(\\>\\|\\s-+\\|\\s.\\)")