diff options
Diffstat (limited to 'lisp/progmodes')
-rw-r--r-- | lisp/progmodes/cc-engine.el | 4 | ||||
-rw-r--r-- | lisp/progmodes/flymake-proc.el | 8 | ||||
-rw-r--r-- | lisp/progmodes/gdb-mi.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/hideif.el | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 457f95f2ca3..db201a6322f 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -1720,7 +1720,7 @@ comment at the start of cc-engine.el for more info." `((c-debug-remove-face beg end 'c-debug-is-sws-face) (c-debug-remove-face beg end 'c-debug-in-sws-face))))) -;; The type of literal position `end' is in in a `before-change-functions' +;; The type of literal position `end' is in a `before-change-functions' ;; function - one of `c', `c++', `pound', or nil (but NOT `string'). (defvar c-sws-lit-type nil) ;; A cons (START . STOP) of the bounds of the comment or CPP construct @@ -2784,7 +2784,7 @@ comment at the start of cc-engine.el for more info." (setq pos npos) (setq c-state-nonlit-pos-cache (cons pos c-state-nonlit-pos-cache))) - ;; Add one extra element above HERE so as to to avoid the previous + ;; Add one extra element above HERE so as to avoid the previous ;; expensive calculation when the next call is close to the current ;; one. This is especially useful when inside a large macro. (when npos diff --git a/lisp/progmodes/flymake-proc.el b/lisp/progmodes/flymake-proc.el index a9caef4fc8e..5c4d451d638 100644 --- a/lisp/progmodes/flymake-proc.el +++ b/lisp/progmodes/flymake-proc.el @@ -169,13 +169,13 @@ from compile.el") "Predicate matching against diagnostic text to detect its type. Takes a single argument, the diagnostic's text and should return a value suitable for indexing -`flymake-diagnostic-types-alist' (which see). If the returned -value is nil, a type of `:error' is assumed. For some backward -compatibility, if a non-nil value is returned that that doesn't +`flymake-diagnostic-types-alist' (which see). If the returned +value is nil, a type of `:error' is assumed. For some backward +compatibility, if a non-nil value is returned that doesn't index that alist, a type of `:warning' is assumed. Instead of a function, it can also be a string, a regular -expression. A match indicates `:warning' type, otherwise +expression. A match indicates `:warning' type, otherwise `:error'") (defun flymake-proc-default-guess (text) diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 7723f700925..28d1974893d 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -2374,7 +2374,7 @@ file names include non-ASCII characters." ;; sequences are not split between chunks of output of the GDB process ;; due to buffering, and arrive together. Finally, if some string ;; included literal \nnn strings (as opposed to non-ASCII characters -;; converted by by GDB/MI to octal escapes), this decoding will mangle +;; converted by GDB/MI to octal escapes), this decoding will mangle ;; those strings. When/if GDB acquires the ability to not ;; escape-protect non-ASCII characters in its MI output, this kludge ;; should be removed. diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 39744833255..b1a2a35d55f 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -1657,8 +1657,8 @@ first arg will be `hif-etc'." ;; The original version of hideif evaluates the macro early and store the ;; final values for the defined macro into the symbol database (aka -;; `hide-ifdef-env'). The evaluation process is "strings -> tokens -> parsed -;; tree -> [value]". (The square bracket refers to what's stored in in our +;; `hide-ifdef-env'). The evaluation process is "strings -> tokens -> parsed +;; tree -> [value]". (The square bracket refers to what's stored in our ;; `hide-ifdef-env'.) ;; ;; This forbids the evaluation of an argumented macro since the parameters |