diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-30 20:54:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-30 20:54:42 -0700 |
| commit | 1393a4d22c4f69fa4cc2f02b70431c28e3c45046 (patch) | |
| tree | ae3bd9a53544a7e8206c584f3540a570eb9f717d /lisp | |
| parent | f24011b4d17da2b39b180fb091d2e6b83aee0d57 (diff) | |
; Spelling and quotation fixes
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog.17 | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index bbf25b6048..1361e7a815 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -8033,7 +8033,7 @@ 2014-08-24 Alan Mackenzie <acm@muc.de> Handle C++11's "auto" and "decltype" constructions. - * progmodes/cc-engine.el (c-forward-type): Enhance to recognise + * progmodes/cc-engine.el (c-forward-type): Enhance to recognize and return 'decltype. (c-forward-decl-or-cast-1): New let variables backup-kwd-sym, prev-kwd-sym, new-style-auto. Enhance to handle the new "auto" @@ -13542,7 +13542,7 @@ c-parse-state. Don't "append-lower-brace-pair" in certain circumstances. Also fix an obscure bug where "\\s!" shouldn't be - recognised as a comment. + recognized as a comment. * progmodes/cc-engine.el (c-state-pp-to-literal): Check for "\\s!" as well as normal comment starter. @@ -17480,7 +17480,7 @@ after a function declaration with only types (no identifiers) in the parentheses. Also, accept a function declaration with just a type inside the parentheses, if this type can be positively - recognised as such, or if a prefix keyword like "explicit" nails + recognized as such, or if a prefix keyword like "explicit" nails down the construct as a declaration. 2013-10-19 Eli Zaretskii <eliz@gnu.org> diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 83ed308e10..2cad2d0242 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -8136,7 +8136,7 @@ comment at the start of cc-engine.el for more info." (and (not context) ;; Deal with C++11's "copy-initialization" ;; where we have <type>(<constant>), by - ;; contraasting with a typeless + ;; contrasting with a typeless ;; <name>(<type><parameter>, ...). (save-excursion (goto-char after-paren-pos) @@ -9839,7 +9839,7 @@ comment at the start of cc-engine.el for more info." ;; return t. If point is definitely neither at nor in a brace list, return ;; nil. ;; - ;; CONTAINING-SEXP is the position of the brace/paren/braacket enclosing + ;; CONTAINING-SEXP is the position of the brace/paren/bracket enclosing ;; POINT, or nil if there is no such position, or we do not know it. LIM is ;; a backward search limit. ;; @@ -9856,7 +9856,7 @@ comment at the start of cc-engine.el for more info." (setq res (c-backward-token-2 1 t lim)) ;; Checks to do only on the first sexp before the brace. - ;; Have we a C++ initialisation, without an "="? + ;; Have we a C++ initialization, without an "="? (if (and (c-major-mode-is 'c++-mode) (cond ((and (not (eq res 0)) diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index a23dddf214..735108ff7d 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1205,7 +1205,7 @@ casts and declarations are fontified. Used on level 2 and higher." (setq start-pos (point)) (when ;; The result of the form below is true when we don't recognize a - ;; declaration or cast, and we don't recognise a "non-decl", + ;; declaration or cast, and we don't recognize a "non-decl", ;; typically a brace list. (if (or (and (eq (get-text-property (point) 'face) 'font-lock-keyword-face) |