summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/desktop.el6
-rw-r--r--lisp/frameset.el2
-rw-r--r--lisp/progmodes/python.el12
3 files changed, 10 insertions, 10 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 91635218228..1bbc33cb244 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -390,7 +390,7 @@ If `delete', frames on other displays are deleted instead of restored."
(defcustom desktop-restore-forces-onscreen t
"If t, offscreen frames are restored onscreen instead.
-If `:all', frames that are partially offscreen are also forced onscren.
+If `:all', frames that are partially offscreen are also forced onscreen.
NOTE: Checking of frame boundaries is only approximate and can fail
to reliably detect frames whose onscreen/offscreen state depends on a
few pixels, especially near the right / bottom borders of the screen."
@@ -670,7 +670,7 @@ if different)."
;; which already takes care of frame restoration and deletion.
(called-interactively-p 'any))
(let* ((this (selected-frame))
- (mini (window-frame (minibuffer-window this)))) ; in case they difer
+ (mini (window-frame (minibuffer-window this)))) ; in case they differ
(dolist (frame (sort (frame-list) #'frameset-minibufferless-first-p))
(condition-case err
(unless (or (eq frame this)
@@ -1032,7 +1032,7 @@ being set (usually, by reading it from the desktop)."
:force-onscreen desktop-restore-forces-onscreen)))
;; Just to silence the byte compiler.
-;; Dynamicaly bound in `desktop-read'.
+;; Dynamically bound in `desktop-read'.
(defvar desktop-first-buffer)
(defvar desktop-buffer-ok-count)
(defvar desktop-buffer-fail-count)
diff --git a/lisp/frameset.el b/lisp/frameset.el
index 7cdab7e3fcc..53ab0a5f081 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -182,7 +182,7 @@ Properties can be set with
;; Let's say that Emacs' frame parameters were never designed as a tool to
;; precisely record (or restore) a frame's state. They grew organically,
;; and their uses and behaviors reflect their history. In using them to
-;; implement framesets, the unwary implementor, or the prospective package
+;; implement framesets, the unwary implementer, or the prospective package
;; writer willing to use framesets in their code, might fall victim of some
;; unexpected... oddities.
;;
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 70c2e5dec53..01833ffd70b 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3080,14 +3080,14 @@ not be passed explicitly unless you know what you are doing."
min-indent
indent
(if (<= indent children-indent-limit)
- ;; This lays within the children indent offset range,
- ;; so it's a normal children of its parent (i.e., not
- ;; a children of a children).
+ ;; This lies within the children indent offset range,
+ ;; so it's a normal child of its parent (i.e., not
+ ;; a child of a child).
(cons (cons label pos) tree)
- ;; Oh noes, a children of a children?!. Fear not, we
- ;; know how to roll. We recursely parse these by
+ ;; Oh no, a child of a child?! Fear not, we
+ ;; know how to roll. We recursively parse these by
;; swapping prev-indent and min-indent plus adding this
- ;; newly found item to a fresh subtree. This works, I
+ ;; newly found item to a fresh subtree. This works, I
;; promise.
(cons
(python-imenu--build-tree