diff options
Diffstat (limited to 'lisp/progmodes')
-rw-r--r-- | lisp/progmodes/ada-mode.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/cc-awk.el | 4 | ||||
-rw-r--r-- | lisp/progmodes/cc-engine.el | 8 | ||||
-rw-r--r-- | lisp/progmodes/cc-fonts.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/cc-mode.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/cc-vars.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/cperl-mode.el | 4 | ||||
-rw-r--r-- | lisp/progmodes/gud.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/idlw-help.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/js.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/pascal.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/ps-mode.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/verilog-mode.el | 6 |
13 files changed, 20 insertions, 20 deletions
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 9d2aad7741b..b8bf62d90b4 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -826,7 +826,7 @@ the 4 file locations can be clicked on and jumped to." ;; to be considered as part of a word or not. ;; Some characters may have multiple meanings depending on the context: ;; - ' is either the beginning of a constant character or an attribute -;; - # is either part of a based litteral or a gnatprep statement. +;; - # is either part of a based literal or a gnatprep statement. ;; - " starts a string, but not if inside a constant character. ;; - ( and ) should be ignored if inside a constant character. ;; Thus their syntax property is changed automatically, and we can still use diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index aa1289cd632..cdbe5b39bf1 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -128,7 +128,7 @@ ;; REGEXPS FOR "HARMLESS" STRINGS/LINES. (defconst c-awk-harmless-char-re "[^_#/\"\\\\\n\r]") ;; Matches any character but a _, #, /, ", \, or newline. N.B. _" starts a -;; localisation string in gawk 3.1 +;; localization string in gawk 3.1 (defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)") ;; Matches an underline NOT followed by ". (defconst c-awk-harmless-string*-re @@ -160,7 +160,7 @@ (defconst c-awk-string-without-end-here-re (concat "\\=_?\"" c-awk-string-innards-re)) ;; Matches an AWK string at point up to, but not including, any terminator. -;; A gawk 3.1+ string may look like _"localisable string". +;; A gawk 3.1+ string may look like _"localizable string". (defconst c-awk-one-line-possibly-open-string-re (concat "\"\\(" c-awk-string-ch-re "\\|" c-awk-non-eol-esc-pair-re "\\)*" "\\(\"\\|\\\\?$\\|\\'\\)")) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 8ac38c253fb..fb146b3976a 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2364,7 +2364,7 @@ comment at the start of cc-engine.el for more info." (defun c-parse-state-get-strategy (here good-pos) ;; Determine the scanning strategy for adjusting `c-parse-state', attempting - ;; to minimise the amount of scanning. HERE is the pertinent position in + ;; to minimize the amount of scanning. HERE is the pertinent position in ;; the buffer, GOOD-POS is a position where `c-state-cache' (possibly with ;; its head trimmed) is known to be good, or nil if there is no such ;; position. @@ -2788,7 +2788,7 @@ comment at the start of cc-engine.el for more info." ;; ;; This function must only be called only when (> `c-state-cache-good-pos' ;; HERE). Usually the gap between CACHE-POS and HERE is large. It is thus - ;; optimised to eliminate (or minimise) scanning between these two + ;; optimised to eliminate (or minimize) scanning between these two ;; positions. ;; ;; Return a three element list (GOOD-POS SCAN-BACK-POS FWD-FLAG), where: @@ -5052,7 +5052,7 @@ comment at the start of cc-engine.el for more info." ;; The strategy now (2010-01) adopted is to mark and unmark < and ;; > IN MATCHING PAIRS ONLY. [Previously, they were marked ;; individually when their context so indicated. This gave rise to -;; intractible problems when one of a matching pair was deleted, or +;; intractable problems when one of a matching pair was deleted, or ;; pulled into a literal.] ;; ;; At each buffer change, the syntax-table properties are removed in a @@ -5965,7 +5965,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; or + ;; o - 'maybe if it's an identifier that might be a type; or ;; o - nil if it can't be a type (the point isn't moved then). ;; ;; The point is assumed to be at the beginning of a token. diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index a5a9582315b..fa94af071f7 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1122,7 +1122,7 @@ casts and declarations are fontified. Used on level 2 and higher." (char-after (match-beginning 1)))) (if types - ;; Register and fontify the identifer as a type. + ;; Register and fontify the identifier as a type. (let ((c-promote-possible-types t)) (goto-char id-start) (c-forward-type)) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index d93d174047b..141cd6f972c 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -587,7 +587,7 @@ that requires a literal mode spec at compile time." (add-hook 'after-change-functions 'c-after-change nil t) (set (make-local-variable 'font-lock-extend-after-change-region-function) 'c-extend-after-change-region)) ; Currently (2009-05) used by all - ; lanaguages with #define (C, C++,; ObjC), and by AWK. + ; languages with #define (C, C++,; ObjC), and by AWK. (defun c-setup-doc-comment-style () "Initialize the variables that depend on the value of `c-doc-comment-style'." diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 02256ead392..549f94387d2 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -420,7 +420,7 @@ If a LINE-TYPE is missing, then \\[indent-for-comment] indents the comment according to `comment-column'. Note that a non-nil value on `c-indent-comments-syntactically-p' -overrides this variable, so empty lines are indentented syntactically +overrides this variable, so empty lines are indented syntactically in that case, i.e. as if \\[c-indent-command] was used instead." :type (let ((space '(cons :tag "space" diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index ca596023151..88193d4d3fb 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -839,7 +839,7 @@ voice); b) Can lineup vertically \"middles\" of rows, like `=' in a = b; cc = d; - c) Can insert spaces where this impoves readability (in one + c) Can insert spaces where this improves readability (in one interactive sweep over the buffer); d) Has support for imenu, including: 1) Separate unordered list of \"interesting places\"; @@ -2801,7 +2801,7 @@ Will not look before LIM." (skip-chars-forward " \t") (if (memq (char-after (point)) (append "#\n" nil)) - nil ; Can't use intentation of this line... + nil ; Can't use indentation of this line... (point))) (skip-chars-forward " \t") (point))) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index c60e8d72abc..3f16b3655b8 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -2094,7 +2094,7 @@ extension EXTN. Normally EXTN is given as the regular expression ;; By this point the current directory is all screwed up. Maybe we ;; could fix things and re-invoke gud-common-init, but for now I think - ;; issueing the error is good enough. + ;; issuing the error is good enough. (if user-error (progn (kill-buffer (current-buffer)) diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 2708346f05f..8155198e3d7 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -989,7 +989,7 @@ This function expects a more or less standard routine header. In particlar it looks for the `NAME:' tag, either with a colon, or alone on a line. Then `NAME:' must be followed by the routine name on the same or the next line. When KEYWORD is non-nil, looks first for a -`KEYWORDS' section. It is amazing how inconsisten this is through +`KEYWORDS' section. It is amazing how inconsistent this is through some IDL libraries I have seen. We settle for a line containing an upper case \"KEYWORD\" string. If this line is not found we search for the keyword anyway to increase the hit-rate diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 0e3fdc78a39..94a9c250fee 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1599,7 +1599,7 @@ will be returned." (defun js-syntactic-context () "Return the JavaScript syntactic context at point. -When called interatively, also display a message with that +When called interactively, also display a message with that context." (interactive) (let* ((syntactic-context (js--syntactic-context-from-pstate diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index 67e3c4a18b4..91a2e946753 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -414,7 +414,7 @@ no args, if that value is non-nil." (electric-pascal-terminate-line))) (defun electric-pascal-colon () - "Insert `:' and do all indentions except line indent on this line." + "Insert `:' and do all indentations except line indent on this line." (interactive) (insert last-command-event) ;; Do nothing if within string. diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index 7810b377e58..c2adc3b801b 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -713,7 +713,7 @@ defines the beginning of a group. These tokens are: { [ <<" (ps-mode-r-balance ">>")) (defun ps-mode-r-balance (right) - "Adjust indentification if point after RIGHT." + "Adjust indenting if point after RIGHT." (if ps-mode-auto-indent (save-excursion (when (re-search-backward (concat "^[ \t]*" (regexp-quote right) "\\=") nil t) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 2d8334bcb7d..4cc4a133c8e 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -2622,7 +2622,7 @@ user-visible changes to the buffer must not be within a (defmacro verilog-save-no-change-functions (&rest body) "Execute BODY forms, disabling all change hooks in BODY. -For insigificant changes, see instead `verilog-save-buffer-state'." +For insignificant changes, see instead `verilog-save-buffer-state'." `(let* ((inhibit-point-motion-hooks t) before-change-functions after-change-functions) @@ -3596,7 +3596,7 @@ With ARG, first kill any existing labels." (looking-at "\\w+\\W*:\\W*\\(coverpoint\\|cross\\|constraint\\)") ;; keep going if we are in the middle of a word (not (or (looking-at "\\<") (forward-word -1))) - ;; stop if we see an assertion (perhaps labled) + ;; stop if we see an assertion (perhaps labeled) (and (looking-at "\\(\\<\\(assert\\|assume\\|cover\\)\\>\\s-+\\<property\\>\\)\\|\\(\\<assert\\>\\)") (progn @@ -6974,7 +6974,7 @@ Signals must be in standard (base vector) form." ;;(verilog-signals-not-in '(("A" "") ("B" "") ("DEL" "[2:3]")) '(("DEL" "") ("EXT" ""))) (defun verilog-signals-memory (in-list) - "Return list of signals in IN-LIST that are memoried (multidimensional)." + "Return list of signals in IN-LIST that are memorized (multidimensional)." (let (out-list) (while in-list (if (nth 3 (car in-list)) |