summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/backquote.el6
-rw-r--r--lisp/emacs-lisp/byte-opt.el10
-rw-r--r--lisp/emacs-lisp/bytecomp.el8
-rw-r--r--lisp/emacs-lisp/cl-indent.el4
-rw-r--r--lisp/emacs-lisp/cust-print.el8
-rw-r--r--lisp/emacs-lisp/edebug.el14
-rw-r--r--lisp/emacs-lisp/float.el4
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
-rw-r--r--lisp/emacs-lisp/lisp.el2
9 files changed, 29 insertions, 29 deletions
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index a74e30ad851..ef5d4a02c99 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -23,7 +23,7 @@
;;; Commentary:
- ;;; This is a rudimentry backquote package written by D. King,
+ ;;; This is a rudimentary backquote package written by D. King,
;;; king@kestrel, on 8/31/85. (` x) is a macro
;;; that expands to a form that produces x. (` (a b ..)) is
;;; a macro that expands into a form that produces a list of what a b
@@ -83,7 +83,7 @@ a list-value atom"
;;; These two advertised variables control what characters are used to
;;; unquote things. I have included , and ,@ as the unquote and
;;; splice operators, respectively, to give users of MIT CADR machine
- ;;; derivitive machines a warm, cosy feeling.
+ ;;; derivative machines a warm, cosy feeling.
(defconst backquote-unquote '(,)
"*A list of all objects that stimulate unquoting in `. Memq test.")
@@ -181,7 +181,7 @@ See backquote.el for details"
;;; Given a state/tailmaker pair that already knows how to make a
;;; partial tail of the desired form, this function knows how to add
- ;;; yet another element to the burgening list. There are four cases;
+ ;;; yet another element to the burgeoning list. There are four cases;
;;; the next item is an atom (which will certainly be quoted); a
;;; (, xxx), which will be evaluated and put into the list at the top
;;; level; a (,@ xxx), which will be evaluated and spliced in, or
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 4a39a71c617..c7ab880cf60 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -388,7 +388,7 @@
((memq fn '(and or)) ; remember, and/or are control structures.
;; take forms off the back until we can't any more.
- ;; In the future it could concievably be a problem that the
+ ;; In the future it could conceivably be a problem that the
;; subexpressions of these forms are optimized in the reverse
;; order, but it's ok for now.
(if for-effect
@@ -522,7 +522,7 @@
;;;
;;; It is now safe to optimize code such that it introduces new bindings.
-;; I'd like this to be a defsubst, but let's not be self-referental...
+;; I'd like this to be a defsubst, but let's not be self-referential...
(defmacro byte-compile-trueconstp (form)
;; Returns non-nil if FORM is a non-nil constant.
(` (cond ((consp (, form)) (eq (car (, form)) 'quote))
@@ -773,7 +773,7 @@
;; I'm not convinced that this is necessary. Doesn't the optimizer loop
;; take care of this? - Jamie
;; I think this may some times be necessary to reduce ie (quote 5) to 5,
-;; so arithmetic optimizers recognize the numerinc constant. - Hallvard
+;; so arithmetic optimizers recognize the numeric constant. - Hallvard
(put 'quote 'byte-optimizer 'byte-optimize-quote)
(defun byte-optimize-quote (form)
(if (or (consp (nth 1 form))
@@ -1063,7 +1063,7 @@
;;; and by the disassembler.
;;;
(defun byte-decompile-bytecode (bytes constvec)
- "Turns BYTECODE into lapcode, refering to CONSTVEC."
+ "Turns BYTECODE into lapcode, referring to CONSTVEC."
(let ((byte-compile-constants nil)
(byte-compile-variables nil)
(byte-compile-tag-number 0))
@@ -1418,7 +1418,7 @@ may generate incorrect code.")
((and (eq (car lap0) 'TAG)
(eq (car lap1) 'TAG))
(and (memq byte-optimize-log '(t byte))
- (byte-compile-log " adjascent tags %d and %d merged"
+ (byte-compile-log " adjacent tags %d and %d merged"
(nth 1 lap1) (nth 1 lap0)))
(setq tmp3 lap)
(while (setq tmp2 (rassq lap0 tmp3))
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index ce72c041551..d1f03516f7c 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -143,7 +143,7 @@
;;;
;;; o The form `eval-when-compile' is like progn, except that the body
;;; is evaluated at compile-time. When it appears at top-level, this
-;;; is analagous to the Common Lisp idiom (eval-when (compile) ...).
+;;; is analogous to the Common Lisp idiom (eval-when (compile) ...).
;;; When it does not appear at top-level, it is similar to the
;;; Common Lisp #. reader macro (but not in interpreted code.)
;;;
@@ -407,7 +407,7 @@ Each element is (INDEX . VALUE)")
(byte-defop 24 -1 byte-varbind "for binding a variable")
(byte-defop 32 0 byte-call "for calling a function")
(byte-defop 40 0 byte-unbind "for unbinding special bindings")
-;; codes 8-47 are consumed by the preceeding opcodes
+;; codes 8-47 are consumed by the preceding opcodes
;; unused: 48-55
@@ -2205,7 +2205,7 @@ If FORM is a lambda or a macro, byte-compile it as a function."
(defun byte-compile-associative (form)
(if (cdr form)
(let ((opcode (get (car form) 'byte-opcode)))
- ;; To compile all the args first may enable some optimizaions.
+ ;; To compile all the args first may enable some optimizations.
(mapcar 'byte-compile-form (setq form (cdr form)))
(while (setq form (cdr form))
(byte-compile-out opcode 0)))
@@ -2310,7 +2310,7 @@ If FORM is a lambda or a macro, byte-compile it as a function."
(defun byte-compile-funarg (form)
;; (mapcar '(lambda (x) ..) ..) ==> (mapcar (function (lambda (x) ..)) ..)
- ;; for cases where it's guarenteed that first arg will be used as a lambda.
+ ;; for cases where it's guaranteed that first arg will be used as a lambda.
(byte-compile-normal-call
(let ((fn (nth 1 form)))
(if (and (eq (car-safe fn) 'quote)
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index f063f92ee7a..f6ad1854012 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -74,7 +74,7 @@ by `lisp-body-indent'.")
;; which does special things with subforms.
(let ((depth 0)
;; Path describes the position of point in terms of
- ;; list-structure with respect to contining lists.
+ ;; list-structure with respect to containing lists.
;; `foo' has a path of (0 4 1) in `((a b c (d foo) f) g)'
(path ())
;; set non-nil when somebody works out the indentation to use
@@ -331,7 +331,7 @@ by `lisp-body-indent'.")
path state indent-point sexp-column normal-indent))
(funcall (function lisp-indent-259)
'((&whole nil &rest
- ;; the following causes wierd indentation
+ ;; the following causes weird indentation
;;(&whole 1 1 2 nil)
)
(&whole nil &rest 1))
diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el
index 355b046b956..863c8daaf3b 100644
--- a/lisp/emacs-lisp/cust-print.el
+++ b/lisp/emacs-lisp/cust-print.el
@@ -121,8 +121,8 @@ If nil, printing proceeds recursively and may lead to
`print-length' and `print-level'.
If non-nil, shared substructures anywhere in the structure are printed
-with `#N=' before the first occurance (in the order of the print
-representation) and `#N#' in place of each subsequent occurance,
+with `#N=' before the first occurrence (in the order of the print
+representation) and `#N#' in place of each subsequent occurrence,
where N is a positive decimal integer.
Currently, there is no way to read this representation in Emacs.")
@@ -269,7 +269,7 @@ string argument will also work. The string is generated with
(defun custom-message (fmt &rest args)
"Replacement for standard `message' that works like `custom-format'."
- ;; It doesnt work to princ the result of custom-format
+ ;; It doesn't work to princ the result of custom-format
;; because the echo area requires special handling
;; to avoid duplicating the output. cust-print-internal-message does it right.
;; (cust-print-internal-princ (apply 'custom-format fmt args))
@@ -352,7 +352,7 @@ string argument will also work. The string is generated with
;; Print the custom OBJECT using the custom type ALIST.
;; For the first predicate that matches the object, the corresponding
;; converter is evaluated with the object and the string that results is
-;; printed with princ. Return nil if no predicte matches the object.
+;; printed with princ. Return nil if no predicate matches the object.
(defun cust-print-custom-object1 (object alist)
(while (and alist (not (funcall (car (car alist)) object)))
(setq alist (cdr alist)))
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 46bc1616487..a5acfd50875 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -127,7 +127,7 @@
;;; Reset edebug-mode only on
;;; first entry of any function at each recursive-edit level.
;;; Add edebug-backtrace, to generate cleaned up
-;;; backtrace. It doesnt "work" like the debug backtrace, however.
+;;; backtrace. It doesn't "work" like the debug backtrace, however.
;;; Require reselecting outside window even if
;;; quit occurs, otherwise save-excursions may restore
;;; buffer to the wrong window.
@@ -180,9 +180,9 @@
;;; Leave point at syntax error, mark at starting position.
;;;
;;; Revision 1.2 88/11/28 12:14:15 liberte
-;;; Bug fixes: cond construct didnt execute.
-;;; () in sexp list didnt parse
-;;; () as variable in condition-case didnt parse.
+;;; Bug fixes: cond construct didn't execute.
+;;; () in sexp list didn't parse
+;;; () as variable in condition-case didn't parse.
;;;
;;; Revision 1.1 88/11/28 12:11:27 liberte
;;; Initial revision
@@ -281,7 +281,7 @@ Assumes Emacs Lisp syntax is active."
(defun edebug-window-list ()
"Return a list of windows, in order of next-window."
- ;; This doesnt work for epoch.
+ ;; This doesn't work for epoch.
(let* ((first-window (selected-window))
(window-list (list first-window))
(next (next-window first-window)))
@@ -1026,7 +1026,7 @@ Leave point after the value, if there is one."
(nreverse value-value-list)))
-;; Bug: this doesnt support condition name lists
+;; Bug: this doesn't support condition name lists
(put 'condition-case 'edebug-form-hook
'(symbolp
form
@@ -1398,7 +1398,7 @@ This is to avoid spurious recentering.")
(eq edebug-arg-mode 'error))
(progn
(setq edebug-mode 'step)
- (edebug-overlay-arrow) ; this doesnt always show up.
+ (edebug-overlay-arrow) ; this doesn't always show up.
(edebug-recursive-edit));; <<<<<< Recursive edit
)
diff --git a/lisp/emacs-lisp/float.el b/lisp/emacs-lisp/float.el
index f6e7bb74972..04281d7eb73 100644
--- a/lisp/emacs-lisp/float.el
+++ b/lisp/emacs-lisp/float.el
@@ -71,10 +71,10 @@
"Number of highest bit")
(defconst mantissa-maxval (1- (ash 1 maxbit))
- "Maximum permissable value of mantissa")
+ "Maximum permissible value of mantissa")
(defconst mantissa-minval (ash 1 maxbit)
- "Minimum permissable value of mantissa")
+ "Minimum permissible value of mantissa")
(defconst floating-point-regexp
"^[ \t]*\\(-?\\)\\([0-9]*\\)\
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 17acda41e22..f7d29dff72c 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -371,7 +371,7 @@ of the start of the containing expression."
(parse-partial-sexp (point) last-sexp 0 t)
(backward-prefix-chars)))))
;; Point is at the point to indent under unless we are inside a string.
- ;; Call indentation hook except when overriden by lisp-indent-offset
+ ;; Call indentation hook except when overridden by lisp-indent-offset
;; or if the desired indentation has already been computed.
(let ((normal-indent (current-column)))
(cond ((elt state 3)
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 9c4cbd1d788..854afdddbf0 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -23,7 +23,7 @@
;;; Commentary:
-;; Lisp ediing commands to go with Lisp major mode.
+;; Lisp editing commands to go with Lisp major mode.
;;; Code: