summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/ada-xref.el2
-rw-r--r--lisp/progmodes/cc-engine.el16
-rw-r--r--lisp/progmodes/cc-vars.el2
-rw-r--r--lisp/progmodes/cperl-mode.el2
-rw-r--r--lisp/progmodes/fortran.el2
-rw-r--r--lisp/progmodes/gdb-mi.el4
-rw-r--r--lisp/progmodes/gud.el2
-rw-r--r--lisp/progmodes/meta-mode.el2
-rw-r--r--lisp/progmodes/prolog.el2
-rw-r--r--lisp/progmodes/sql.el18
10 files changed, 26 insertions, 26 deletions
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 4a57a1eef67..4cf00cd3cfd 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1747,7 +1747,7 @@ Information is extracted from the ali file."
(unless declaration-found
- ;; Since we alread know the number of the file, search for a direct
+ ;; Since we already know the number of the file, search for a direct
;; reference to it
(goto-char (point-min))
(set 'declaration-found t)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index ea0a8f2d3b3..fd32e5e956c 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -988,7 +988,7 @@ comment at the start of cc-engine.el for more info."
;; Just gone back over an ordinary symbol of some sort?
(t (c-crosses-statement-barrier-p
(point) maybe-after-boundary-pos))))
-
+
(when boundary-pos
(setq pptok ptok
ptok tok
@@ -1065,7 +1065,7 @@ comment at the start of cc-engine.el for more info."
pos tok) ; always non-nil
) ; end of (catch loop ....)
) ; end of sexp-at-a-time (while ....)
-
+
;; If the stack isn't empty there might be errors to report.
(while stack
(if (and (vectorp saved-pos) (eq (length saved-pos) 3))
@@ -1795,7 +1795,7 @@ comment at the start of cc-engine.el for more info."
rung-is-marked simple-ws-beg cmt-skip-pos)
;; Skip simple horizontal ws and do a quick check on the preceding
- ;; character to see if it's anying that can't end syntactic ws, so we can
+ ;; character to see if it's anything that can't end syntactic ws, so we can
;; bail out early in the majority of cases when there just are a few ws
;; chars. Newlines are complicated in the backward direction, so we can't
;; skip over them.
@@ -4051,7 +4051,7 @@ comment at the start of cc-engine.el for more info."
;; a relevant match.
(goto-char pos)
nil))))))
-
+
(> (point)
(progn
;; Skip syntactic ws afterwards so that we don't stop at the
@@ -6277,7 +6277,7 @@ comment at the start of cc-engine.el for more info."
;; car ^ ^ point
;; Foo::Foo (int b) : Base (b) {}
;; car ^ ^ point
- ;;
+ ;;
;; The cdr of the return value is non-nil when a
;; `c-typedef-decl-kwds' specifier is found in the declaration.
;; Specifically it is a dotted pair (A . B) where B is t when a
@@ -6285,7 +6285,7 @@ comment at the start of cc-engine.el for more info."
;; other `c-typedef-decl-kwds' (e.g. class, struct, enum)
;; specifier is present. I.e., (some of) the declared
;; identifier(s) are types.
- ;;
+ ;;
;; If a cast is parsed:
;;
;; The point is left at the first token after the closing paren of
@@ -8461,7 +8461,7 @@ comment at the start of cc-engine.el for more info."
nil)
(t nil))))
(eolp))
-
+
(goto-char pos)
(progn (c-backward-syntactic-ws)
(eq (point) pos))
@@ -8922,7 +8922,7 @@ comment at the start of cc-engine.el for more info."
;; FIXME: Should use c-add-stmt-syntax, but it's not yet
;; template aware.
(c-add-syntax 'template-args-cont (point) placeholder))
-
+
;; CASE D: continued statement.
(t
(c-beginning-of-statement-1 containing-sexp)
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index c7e78cb282a..02256ead392 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -963,7 +963,7 @@ this is `c-lineup-ObjC-method-call', which would align it like:
[foo blahBlahBlah: fred
thisIsTooDamnLong: barney
-This behaviour can be overridden by customizing the indentation of
+This behavior can be overridden by customizing the indentation of
`objc-method-call-cont' in the \"objc\" style."
:type 'integer
:group 'c)
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index a79d1a2c064..0556741b65b 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -902,7 +902,7 @@ the settings present before the switch.
9) When doing indentation of control constructs, may correct
line-breaks/spacing between elements of the construct.
-10) Uses a linear-time algorith for indentation of regions (on Emaxen with
+10) Uses a linear-time algorithm for indentation of regions (on Emaxen with
capable syntax engines).
11) Syntax-highlight, indentation, sexp-recognition inside regular expressions.
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index cb0b02ff350..009400504b2 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -29,7 +29,7 @@
;; form. For editing Fortran 90 free format source, use `f90-mode'
;; (f90.el). It is meant to support the GNU Fortran language
;; implemented by g77 (its extensions to Fortran77 and
-;; interpretations, e.g. of blackslash in strings).
+;; interpretations, e.g. of backslash in strings).
;;; History:
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index c88727c721c..53807b8de30 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2217,7 +2217,7 @@ Return position where LINE begins."
(defun gdb-mapcar* (function &rest seqs)
"Apply FUNCTION to each element of SEQS, and make a list of the results.
If there are several SEQS, FUNCTION is called with that many
-arugments, and mapping stops as sson as the shortest list runs
+arguments, and mapping stops as sson as the shortest list runs
out."
(let ((shortest (apply #'min (mapcar #'length seqs))))
(mapcar (lambda (i)
@@ -3428,7 +3428,7 @@ breakpoints buffer."
(error "Not recognized as break/watchpoint line")))))
-;; Frames buffer. This displays a perpetually correct bactrack trace.
+;; Frames buffer. This displays a perpetually correct backtrack trace.
;;
(def-gdb-trigger-and-handler
gdb-invalidate-frames (gdb-current-context-command "-stack-list-frames")
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 543539421fe..b54b2dc5f47 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2102,7 +2102,7 @@ extension EXTN. Normally EXTN is given as the regular expression
massaged-args)))
;; Search for an association with P, a fully qualified class name, in
-;; gud-jdb-class-source-alist. The asssociation gives the fully
+;; gud-jdb-class-source-alist. The association gives the fully
;; qualified file name of the source file which produced the class.
(defun gud-jdb-find-source-file (p)
(cdr (assoc p gud-jdb-class-source-alist)))
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index e15f765ea58..958c1bfb0cc 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -700,7 +700,7 @@ If the list was changed, sort the list and remove duplicates first."
(defun meta-beginning-of-defun (&optional arg)
- "Move backward to beginnning of a defun in Metafont or MetaPost code.
+ "Move backward to beginning of a defun in Metafont or MetaPost code.
With numeric argument, do it that many times.
Negative arg -N means move forward to Nth following beginning of defun.
Returns t unless search stops due to beginning or end of buffer."
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 00315856ad5..93d27042dc8 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -151,7 +151,7 @@
;; (`prolog-electric-dot-full-predicate-template', defaults to t
;; since it seems quicker to me to just type those commata). A
;; trivial adaptation of a patch by Markus Triska.
-;; o Improved the behaviour of electric if-then-else to only skip
+;; o Improved the behavior of electric if-then-else to only skip
;; forward if the parenthesis/semicolon is preceded by
;; whitespace. Once more a trivial adaptation of a patch by
;; Markus Triska.
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 97a1c4605c2..3166abb21a7 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -672,7 +672,7 @@ highlighted properly when you open them."
:safe 'symbolp)
(defvaralias 'sql-dialect 'sql-product)
-;; misc customization of sql.el behaviour
+;; misc customization of sql.el behavior
(defcustom sql-electric-stuff nil
"Treat some input as electric.
@@ -3600,12 +3600,12 @@ The list is maintained in SQL interactive buffers.")
(setq has-schema (and
(>= (length (car names)) schema-len)
(string= schema-dot
- (downcase (substring (car names)
+ (downcase (substring (car names)
0 schema-len))))
names (cdr names)))
(unless has-schema
(sql-build-completions schema)))))
-
+
;; Try to find the completion
(cond
((not predicate)
@@ -3951,7 +3951,7 @@ is specified in the connection settings."
;; interactive session
(eval `(let ((sql-connection ,connection)
(,param-var ',rem-params))
- (sql-product-interactive sql-product
+ (sql-product-interactive sql-product
new-name)))))
(message "SQL Connection <%s> does not exist" connection)
@@ -3981,16 +3981,16 @@ optionally is saved to the user's init file."
(if connection
(message "This session was started by a connection; it's already been saved.")
-
+
(let ((login (sql-get-product-feature product :sqli-login))
(alist sql-connection-alist)
connect)
-
+
;; Remove the existing connection if the user says so
(when (and (assoc name alist)
(yes-or-no-p (format "Replace connection definition <%s>? " name)))
(setq alist (assq-delete-all name alist)))
-
+
;; Add the new connection if it doesn't exist
(if (assoc name alist)
(message "Connection <%s> already exists" name)
@@ -4747,8 +4747,8 @@ Try to set `comint-output-filter-functions' like this:
(sql-redirect sqlbuf "\\t off")
(when (not (string= a "aligned"))
(sql-redirect sqlbuf "\\a"))
-
- ;; Return the list of table names (public schema name can be omitted)
+
+ ;; Return the list of table names (public schema name can be omitted)
(mapcar (lambda (tbl)
(if (string= (car tbl) "public")
(cadr tbl)
View Lorry Controller Status