diff options
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 8 | ||||
| -rw-r--r-- | lisp/progmodes/hideif.el | 12 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/subword.el | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 9eb95f69c48..224ea36a22a 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -3296,7 +3296,7 @@ comment at the start of cc-engine.el for more info." (setq res (c-remove-stale-state-cache start-point here here-bopl)) (setq cache-pos (car res) scan-backward-pos (cadr res) - cons-separated (car (cddr res)) + cons-separated (car (cddr res)) bopl-state (cadr (cddr res))) ; will be nil if (< here-bopl ; start-point) (if (and scan-backward-pos @@ -6286,7 +6286,7 @@ comment at the start of cc-engine.el for more info." ;; `*-font-lock-extra-types'); ;; o - 'prefix if it's a known prefix of a type; ;; o - 'found if it's a type that matches one in `c-found-types'; - ;; o - 'maybe if it's an identfier that might be a type; + ;; o - 'maybe if it's an identifier that might be a type; ;; o - 'decltype if it's a decltype(variable) declaration; - or ;; o - nil if it can't be a type (the point isn't moved then). ;; @@ -6668,8 +6668,8 @@ comment at the start of cc-engine.el for more info." ;; auto foo = 5; ;; car ^ ^ point ;; auto cplusplus_11 (int a, char *b) -> decltype (bar): - ;; car ^ ^ point - ;; + ;; car ^ ^ point + ;; ;; ;; ;; The cdr of the return value is non-nil when a diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index b1eaa6ad66c..839f5290ae3 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -653,7 +653,7 @@ that form should be displayed.") (stringp id)))) (defun hif-define-operator (tokens) - "`Upgrade' hif-define xxx to '(hif-define xxx)' so it won't be subsitituted." + "`Upgrade' hif-define xxx to '(hif-define xxx)' so it won't be substituted." (let ((result nil) (tok nil)) (while (setq tok (pop tokens)) @@ -975,7 +975,7 @@ factor : '!' factor | '~' factor | '(' expr ')' | 'defined(' id ')' | (defun hif-define-macro (_parmlist _token-body) "A marker for defined macro with arguments. -This macro cannot be evaluated alone without parameters inputed." +This macro cannot be evaluated alone without parameters input." ;;TODO: input arguments at run time, use minibuffer to query all arguments (error "Argumented macro cannot be evaluated without passing any parameter")) @@ -1144,14 +1144,14 @@ preprocessing token" actual-count (length actual-parms)) (if (> formal-count actual-count) - (error "Too few parmameter for macro %S" macro-name) + (error "Too few parameters for macro %S" macro-name) (if (< formal-count actual-count) (or etc (error "Too many parameters for macro %S" macro-name)))) ;; Perform token replacement on the MACRO-BODY with the parameters (while (setq formal (pop formal-parms)) - ;; Prevent repetitive substitutation, thus cannot use `subst' + ;; Prevent repetitive substitution, thus cannot use `subst' ;; for example: ;; #define mac(a,b) (a+b) ;; #define testmac mac(b,y) @@ -1734,7 +1734,7 @@ first arg will be `hif-etc'." (or (setcdr SA expr) t) ;; Lazy evaluation, eval only if hif-lookup find it. ;; Define it anyway, even if nil it's still in list - ;; and therefore considerred defined + ;; and therefore considered defined. (push (cons (intern name) expr) hide-ifdef-env))))) ;; #undef (and name @@ -1912,7 +1912,7 @@ Return as (TOP . BOTTOM) the extent of ifdef block." (defun hide-ifdef-block (&optional arg start end) "Hide the ifdef block (true or false part) enclosing or before the cursor. -With optional prefix agument ARG, also hide the #ifdefs themselves." +With optional prefix argument ARG, also hide the #ifdefs themselves." (interactive "P\nr") (let ((hide-ifdef-lines arg)) (if mark-active diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index dc38966bcaf..5999ddda5f9 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2153,7 +2153,7 @@ This utility is useful in situations where the output may be received in chunks, since `accept-process-output' gives no guarantees they will be grabbed in a single call. An example use case for this would be the CPython shell start-up, where the -banner and the initial prompt are received separetely." +banner and the initial prompt are received separately." (let ((regexp (or regexp comint-prompt-regexp))) (catch 'found (while t @@ -4110,7 +4110,7 @@ to \"^python-\"." (cdr pair)))) (buffer-local-variables from-buffer))) -(defvar comint-last-prompt-overlay) ; Shut up, bytecompiler +(defvar comint-last-prompt-overlay) ; Shut up, byte compiler. (defun python-util-comint-last-prompt () "Return comint last prompt overlay start and end. diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el index a8455c50064..892b2aa1b06 100644 --- a/lisp/progmodes/subword.el +++ b/lisp/progmodes/subword.el @@ -113,7 +113,7 @@ called a `subword'. Here are some examples: NSGraphicsContext => \"NS\", \"Graphics\" and \"Context\" This mode changes the definition of a word so that word commands -treat nomenclature boundaries as word bounaries. +treat nomenclature boundaries as word boundaries. \\{subword-mode-map}" :lighter " ," @@ -130,7 +130,7 @@ treat nomenclature boundaries as word bounaries. ;; N.B. These commands aren't used unless explicitly invoked; they're ;; here for compatibility. Today, subword-mode leaves motion commands ;; alone and uses `find-word-boundary-function-table' to change how -;; `forward-word' and other low-level commands detect word bounaries. +;; `forward-word' and other low-level commands detect word boundaries. ;; This way, all word-related activities, not just the images we ;; imagine here, get subword treatment. @@ -334,7 +334,7 @@ as parts of words: e.g., in `superword-mode', tab) "Assigned to `find-word-boundary-function-table' in `subword-mode' and `superword-mode'; defers to -`subword-find-word-bounary'.") +`subword-find-word-boundary'.") (defconst subword-empty-char-table (make-char-table nil) |