summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/misc/vhdl-mode.texi8
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/ChangeLog.162
-rw-r--r--lisp/calendar/icalendar.el6
-rw-r--r--lisp/composite.el2
-rw-r--r--lisp/emacs-lisp/eldoc.el2
-rw-r--r--lisp/emacs-lisp/subr-x.el8
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-cloud.el2
-rw-r--r--lisp/gnus/gnus-fun.el2
-rw-r--r--lisp/ldefs-boot.el2
-rw-r--r--lisp/ls-lisp.el2
-rw-r--r--lisp/progmodes/cc-engine.el8
-rw-r--r--lisp/progmodes/hideif.el12
-rw-r--r--lisp/progmodes/python.el4
-rw-r--r--lisp/progmodes/subword.el6
-rw-r--r--lisp/rect.el2
-rw-r--r--lisp/ses.el14
-rw-r--r--lisp/textmodes/tex-mode.el2
-rw-r--r--lisp/window.el4
-rw-r--r--src/alloc.c4
-rw-r--r--src/buffer.c2
-rw-r--r--src/frame.c2
-rw-r--r--src/frame.h2
-rw-r--r--test/automated/subr-x-tests.el12
-rw-r--r--test/automated/tildify-tests.el2
26 files changed, 67 insertions, 56 deletions
diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi
index 35c6e0b130..39bdcac513 100644
--- a/doc/misc/vhdl-mode.texi
+++ b/doc/misc/vhdl-mode.texi
@@ -212,7 +212,7 @@ indented relative to buffer position 20, which is the @samp{b} in the
@cindex comment only line
Syntactic component lists can contain more than one component, and
-individual syntactic compenents need not have relative buffer positions.
+individual syntactic components need not have relative buffer positions.
The most common example of this is a line that contains a @dfn{comment
only line}.
@example
@@ -416,7 +416,7 @@ to:
@end group
@end example
-In other words, we want to change the indentation of the statments
+In other words, we want to change the indentation of the statements
inside the inverter process. Notice that the construct we want to
change starts on line 3. To change the indentation of a line, we need
to see which syntactic component affect the offset calculations for that
@@ -630,7 +630,7 @@ using @code{vhdl-set-style}.
@findex set-offset (vhdl-)
Another variable, @code{vhdl-file-offsets}, takes an association list
similar to what is allowed in @code{vhdl-offsets-alist}. When the file is
-visited, VHDL Mode will automatically institute these offets using
+visited, VHDL Mode will automatically institute these offsets using
@code{vhdl-set-offset}. @xref{Customizing Indentation}.
Note that file style settings (i.e. @code{vhdl-file-style}) are applied
@@ -648,7 +648,7 @@ before file offset settings (i.e. @code{vhdl-file-offsets}).
For most users, VHDL Mode will support their coding styles with
very little need for customizations. Usually, one of the standard
styles defined in @code{vhdl-style-alist} will do the trick. Sometimes,
-one of the syntactic symbol offsets will need to be tweeked slightly, or
+one of the syntactic symbol offsets will need to be tweaked slightly, or
perhaps @code{vhdl-basic-offset} will need to be changed. However, some
styles require a more advanced ability for customization, and one of the
real strengths of VHDL Mode is that the syntactic analysis model
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82487d66a1..d19a9eba20 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-11 Paul Eggert <eggert@cs.ucla.edu>
+
+ * ses.el (ses-file-format-extend-parameter-list): Rename from
+ ses-file-format-extend-paramter-list, to correct a misspelling.
+ All uses changed.
+
2014-09-10 Alan Mackenzie <acm@muc.de>
CC Mode: revert recent changes and fix bug 17463 (cc-langs.elc
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 3e02131ae8..d46337244f 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -5052,7 +5052,7 @@
(w32-handle-dropped-file): Convert incoming dropped files from
Windows paths to Cygwin ones before passing them on to the rest of
Emacs.
- (w32-drag-n-drop): New paramter new-frame. Simplify logic.
+ (w32-drag-n-drop): New parameter new-frame. Simplify logic.
(w32-initialize-window-system): Assert we're not initialized twice.
* term/x-win.el: Require cl-lib; add ourselves to display-format-alist.
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 784881e401..1fffe37795 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -1531,7 +1531,7 @@ entries. ENTRY-MAIN is the first line of the diary entry."
Enumerate the evaluated sexp entry for the next
`icalendar-export-sexp-enumeration-days' days. NONMARKER is a
regular expression matching the start of non-marking entries.
-ENTRY-MAIN is the first line of the diary entry.
+ENTRY-MAIN is the first line of the diary entry.
Optional argument START determines the first day of the
enumeration, given as a time value, in same format as returned by
@@ -1574,8 +1574,8 @@ enumeration, given as a time value, in same format as returned by
(let ((calendar-date-style 'iso))
(icalendar--convert-ordinary-to-ical
nonmarker (format "%4d/%02d/%02d %s" y m d see))))
- (;TODO:
- (error (format "Unsopported Sexp-entry: %s"
+ (;TODO:
+ (error (format "Unsupported Sexp-entry: %s"
entry-main))))))
(number-sequence
0 (- icalendar-export-sexp-enumeration-days 1))))))
diff --git a/lisp/composite.el b/lisp/composite.el
index 666d6c9dd9..ca38c39cd6 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -702,7 +702,7 @@ All non-spacing characters have this function in
(setq xoff (- (lglyph-rbearing fc))))
(if (< dc-width fc-width)
;; The following glyph is wider, but we don't know how to
- ;; align both glyphs. So, try the easiet method;
+ ;; align both glyphs. So, try the easiest method;
;; i.e. align left edges of the glyphs.
(setq xoff (- xoff (- dc-width) (- (lglyph-lbearing fc )))
width (- fc-width dc-width)))
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 6f933268e5..50c7816286 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -411,7 +411,7 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'."
(when (cdr split)
(setq key-have-value t))))))))
;; If `cur-a' is not one of `args-lst-ak'
- ;; assume user is entering an unknow key
+ ;; assume user is entering an unknown key
;; referenced in last position in signature.
(other-key-arg (and (stringp cur-a)
args-lst-ak
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 76473b39a7..062743a74f 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -47,7 +47,7 @@ last. FORMS are the expressions to be threaded."
(_ (car forms))))
(defmacro thread-first (&rest forms)
- "Thread FORMS elements as the first argument of their succesor.
+ "Thread FORMS elements as the first argument of their successor.
Example:
(thread-first
5
@@ -64,7 +64,7 @@ threading."
`(internal--thread-argument t ,@forms))
(defmacro thread-last (&rest forms)
- "Thread FORMS elements as the last argument of their succesor.
+ "Thread FORMS elements as the last argument of their successor.
Example:
(thread-last
5
@@ -118,7 +118,7 @@ threading."
"Process BINDINGS and if all values are non-nil eval THEN, else ELSE.
Argument BINDINGS is a list of tuples whose car is a symbol to be
bound and (optionally) used in THEN, and its cadr is a sexp to be
-evaled to set symbol's value. In the special case you only want
+evalled to set symbol's value. In the special case you only want
to bind a single value, BINDINGS can just be a plain tuple."
(declare (indent 2) (debug ((&rest (symbolp form)) form body)))
(when (and (<= (length bindings) 2)
@@ -134,7 +134,7 @@ to bind a single value, BINDINGS can just be a plain tuple."
"Process BINDINGS and if all values are non-nil eval BODY.
Argument BINDINGS is a list of tuples whose car is a symbol to be
bound and (optionally) used in BODY, and its cadr is a sexp to be
-evaled to set symbol's value. In the special case you only want
+evalled to set symbol's value. In the special case you only want
to bind a single value, BINDINGS can just be a plain tuple."
(declare (indent 1) (debug if-let))
(list 'if-let bindings (macroexp-progn body)))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fbf34b73cf..956cc6b70c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-11 Paul Eggert <eggert@cs.ucla.edu>
+
+ * gnus-cloud.el (gnus-cloud-parse-version-1): Fix misspelling
+ of ":delete".
+
2014-08-26 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-article-browse-html-save-cid-content)
diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el
index c47976bdcf..ec85a16ba3 100644
--- a/lisp/gnus/gnus-cloud.el
+++ b/lisp/gnus/gnus-cloud.el
@@ -125,7 +125,7 @@
(let ((spec (ignore-errors (read (current-buffer))))
length)
(when (and (consp spec)
- (memq (plist-get spec :type) '(:file :data :deleta)))
+ (memq (plist-get spec :type) '(:file :data :delete)))
(setq length (plist-get spec :length))
(push (append spec
(list
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index e0d1578f49..f917737784 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -239,7 +239,7 @@ Files matching `gnus-face-omit-files' are not considered."
;;;###autoload
(defun gnus-insert-random-face-header ()
- "Insert a randome Face header from `gnus-face-directory'."
+ "Insert a random Face header from `gnus-face-directory'."
(gnus--insert-random-face-with-type 'gnus-random-face 'Face))
(defface gnus-x-face '((t (:foreground "black" :background "white")))
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 1ac2bb9e4e..dc01f2e76d 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -25893,7 +25893,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}
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index b8ea8d07f0..9593300509 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -543,7 +543,7 @@ Uses `string-collate-lessp' if `ls-lisp-use-string-collate' is non-nil,
On GNU/Linux systems, if the locale specifies UTF-8 as the codeset,
the sorting order will place together file names that differ only
by punctuation characters, like `.emacs' and `emacs'. To have a
-similar behavior on MS-Widnows, customize `ls-lisp-UCA-like-collation'
+similar behavior on MS-Windows, customize `ls-lisp-UCA-like-collation'
to a non-nil value."
(let ((w32-collate-ignore-punctuation ls-lisp-UCA-like-collation))
(if ls-lisp-use-string-collate
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 9eb95f69c4..224ea36a22 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 b1eaa6ad66..839f5290ae 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 dc38966bca..5999ddda5f 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 a8455c5006..892b2aa1b0 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)
diff --git a/lisp/rect.el b/lisp/rect.el
index 0350ed6b22..23bbbfbbdc 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -113,7 +113,7 @@ Point is at the end of the segment of this line within the rectangle."
(if (window-parameter nil 'rectangle--point-crutches)
(setf (window-parameter nil 'rectangle--point-crutches) nil))
(if rectangle--mark-crutches (setq rectangle--mark-crutches nil)))
- ;; If move-to-column over-shooted, move back one char so we're
+ ;; If move-to-column overshot, move back one char so we're
;; at the position where rectangle--highlight-for-redisplay
;; will add the overlay (so that the cursor can be drawn at the
;; right place).
diff --git a/lisp/ses.el b/lisp/ses.el
index bfe021f530..e11fee4e97 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -301,7 +301,7 @@ default printer and then modify its output.")
(defmacro ses--metaprogramming (exp) (declare (debug t)) (eval exp t))
(ses--metaprogramming
`(progn ,@(mapcar (lambda (x) `(defvar ,(or (car-safe x) x))) ses-localvars)))
-
+
(defun ses-set-localvars ()
"Set buffer-local and initialize some SES variables."
(dolist (x ses-localvars)
@@ -1349,11 +1349,11 @@ ses--default-printer, ses--numrows, or ses--numcols."
(goto-char ses--params-marker)
(forward-line def))))
-(defun ses-file-format-extend-paramter-list (new-file-format)
+(defun ses-file-format-extend-parameter-list (new-file-format)
"Extend the global parameters list when file format is updated
from 2 to 3. This happens when local printer function are added
to a sheet that was created with SES version 2. This is not
-undoable. Return nil when there was no change, and non nil otherwise."
+undoable. Return nil when there was no change, and non nil otherwise."
(save-excursion
(cond
((and (= ses--file-format 2) (= 3 new-file-format))
@@ -1759,7 +1759,7 @@ Does not execute cell formulas or print functions."
(numberp (nth 2 params))
(> (nth 2 params) 0)
(or (<= params-len 3)
- (let ((numlocprn (nth 3 params)))
+ (let ((numlocprn (nth 3 params)))
(and (integerp numlocprn) (>= numlocprn 0)))))
(error "Invalid SES file"))
(setq ses--file-format (car params)
@@ -1793,8 +1793,8 @@ Does not execute cell formulas or print functions."
(mapc 'ses-printer-record ses-standard-printer-functions)
(setq ses--symbolic-formulas nil)
- ;; Load local printer definitions.
- ;; This must be loaded *BEFORE* cells and column printers because the latters
+ ;; Load local printer definitions.
+ ;; This must be loaded *BEFORE* cells and column printers because the latter
;; may call them.
(save-excursion
(forward-line (* ses--numrows (1+ ses--numcols)))
@@ -3462,7 +3462,7 @@ Uses the value COMPILED-VALUE for this printer."
(backward-char))
(insert printer-def-text)
(when (= create-printer 1)
- (ses-file-format-extend-paramter-list 3)
+ (ses-file-format-extend-parameter-list 3)
(ses-set-parameter 'ses--numlocprn
(+ ses--numlocprn create-printer))))))))))
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 2e2f412b99..8c7ac312b9 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2576,7 +2576,7 @@ line LINE of the window, or centered if LINE is nil."
(defcustom tex-print-file-extension ".dvi"
"The TeX-compiled file extension for viewing and printing.
If you use pdflatex instead of latex, set this to \".pdf\" and modify
- `tex-dvi-view-command' and `tex-dvi-print-command' appropriatelty."
+ `tex-dvi-view-command' and `tex-dvi-print-command' appropriately."
:type 'string
:group 'tex-view
:version "24.5")
diff --git a/lisp/window.el b/lisp/window.el
index 539384c603..d88f290119 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3026,12 +3026,12 @@ routines."
If necessary and possible, make sure that every window on frame
FRAME has its minimum height. Optional argument HORIZONTAL
non-nil means to make sure that every window on frame FRAME has
-its minimum width. The minimumm height/width of a window is the
+its minimum width. The minimum height/width of a window is the
respective value returned by `window-min-size' for that window.
Return t if all windows were resized appropriately. Return nil
if at least one window could not be resized as requested, which
-may happen when the FRAME is not large enough to accomodate it."
+may happen when the FRAME is not large enough to accommodate it."
(let ((value t))
(walk-window-tree
(lambda (window)
diff --git a/src/alloc.c b/src/alloc.c
index 1dbd46d6f8..a0725efef0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -453,7 +453,7 @@ mmap_lisp_allowed_p (void)
/* If we can't store all memory addresses in our lisp objects, it's
risky to let the heap use mmap and give us addresses from all
over our address space. We also can't use mmap for lisp objects
- if we might dump: unexec doesn't preserve the contents of mmaped
+ if we might dump: unexec doesn't preserve the contents of mmapped
regions. */
return pointers_fit_in_lispobj_p () && !might_dump;
}
@@ -7131,7 +7131,7 @@ detect_suspicious_free (void* ptr)
DEFUN ("suspicious-object", Fsuspicious_object, Ssuspicious_object, 1, 1, 0,
doc: /* Return OBJ, maybe marking it for extra scrutiny.
-If Emacs is compiled with suspicous object checking, capture
+If Emacs is compiled with suspicious object checking, capture
a stack trace when OBJ is freed in order to help track down
garbage collection bugs. Otherwise, do nothing and return OBJ. */)
(Lisp_Object obj)
diff --git a/src/buffer.c b/src/buffer.c
index 7a6ddfa719..9f3a824a73 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5943,7 +5943,7 @@ The value takes effect whenever you tell a window to display this buffer;
for instance, with `set-window-buffer' or when `display-buffer' displays it.
A value of `bottom' means put the horizontal scroll bar at the bottom of
-the window; a value of nil means don't show any horizonal scroll bars.
+the window; a value of nil means don't show any horizontal scroll bars.
A value of t (the default) means do whatever the window's frame
specifies. */);
diff --git a/src/frame.c b/src/frame.c
index d0e585622e..9410031234 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -351,7 +351,7 @@ frame_windows_min_size (Lisp_Object frame, Lisp_Object horizontal, Lisp_Object p
/* Make sure windows sizes of frame F are OK. new_width and new_height
are in pixels. A value of -1 means no change is requested for that
- size (but the frame may still have to be resized to accomodate
+ size (but the frame may still have to be resized to accommodate
windows with their minimum sizes.
The argument INHIBIT can assume the following values:
diff --git a/src/frame.h b/src/frame.h
index c942a9008f..947ba6dccd 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1288,7 +1288,7 @@ extern Lisp_Object Vframe_list;
/ FRAME_LINE_HEIGHT (f))
/* Return the pixel width/height of frame F with a text size of
- width/heigh. */
+ width/height. */
#define FRAME_TEXT_TO_PIXEL_WIDTH(f, width) \
((width) \
+ FRAME_SCROLL_BAR_AREA_WIDTH (f) \
diff --git a/test/automated/subr-x-tests.el b/test/automated/subr-x-tests.el
index df8412699a..03541f173f 100644
--- a/test/automated/subr-x-tests.el
+++ b/test/automated/subr-x-tests.el
@@ -165,7 +165,7 @@
(list 1 2 3))))
(ert-deftest subr-x-test-if-let-false ()
- "Test `if-let' with falsey bindings."
+ "Test `if-let' with falsie bindings."
(should (equal
(if-let (a nil)
(list a b c)
@@ -205,8 +205,8 @@
"no")
(list 1 2 3))))
-(ert-deftest subr-x-test-if-let-and-lazyness-is-preserved ()
- "Test `if-let' respects `and' lazyness."
+(ert-deftest subr-x-test-if-let-and-laziness-is-preserved ()
+ "Test `if-let' respects `and' laziness."
(let (a-called b-called c-called)
(should (equal
(if-let ((a nil)
@@ -360,7 +360,7 @@
(list 1 2 3))))
(ert-deftest subr-x-test-when-let-false ()
- "Test `when-let' with falsey bindings."
+ "Test `when-let' with falsie bindings."
(should (equal
(when-let (a nil)
(list a b c)
@@ -399,8 +399,8 @@
(list a b c))
(list 1 2 3))))
-(ert-deftest subr-x-test-when-let-and-lazyness-is-preserved ()
- "Test `when-let' respects `and' lazyness."
+(ert-deftest subr-x-test-when-let-and-laziness-is-preserved ()
+ "Test `when-let' respects `and' laziness."
(let (a-called b-called c-called)
(should (equal
(progn
diff --git a/test/automated/tildify-tests.el b/test/automated/tildify-tests.el
index 86c83d7ac5..53c2e62019 100644
--- a/test/automated/tildify-tests.el
+++ b/test/automated/tildify-tests.el
@@ -1,4 +1,4 @@
-;;; tildify-test.el --- ERT tests for teldify.el
+;;; tildify-test.el --- ERT tests for tildify.el
;; Copyright (C) 2014 Free Software Foundation, Inc.
generated by cgit v1.2.3 (git 2.46.2) at 2024-11-23 18:18:53 +0000