aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2013-08-15 22:15:51 -0700
committerPaul Eggert2013-08-15 22:15:51 -0700
commit526e5233cc0e2375798bdc79329a893302fdfb4b (patch)
treea4c1d95440225335cd6864a23e6fa1f6c5d6b28b /lisp
parentc8068af56770f8b0be93218e76dd17ea508f3365 (diff)
downloademacs-526e5233cc0e2375798bdc79329a893302fdfb4b.tar.gz
emacs-526e5233cc0e2375798bdc79329a893302fdfb4b.zip
Spelling fixes.
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."
390 390
391(defcustom desktop-restore-forces-onscreen t 391(defcustom desktop-restore-forces-onscreen t
392 "If t, offscreen frames are restored onscreen instead. 392 "If t, offscreen frames are restored onscreen instead.
393If `:all', frames that are partially offscreen are also forced onscren. 393If `:all', frames that are partially offscreen are also forced onscreen.
394NOTE: Checking of frame boundaries is only approximate and can fail 394NOTE: Checking of frame boundaries is only approximate and can fail
395to reliably detect frames whose onscreen/offscreen state depends on a 395to reliably detect frames whose onscreen/offscreen state depends on a
396few pixels, especially near the right / bottom borders of the screen." 396few pixels, especially near the right / bottom borders of the screen."
@@ -670,7 +670,7 @@ if different)."
670 ;; which already takes care of frame restoration and deletion. 670 ;; which already takes care of frame restoration and deletion.
671 (called-interactively-p 'any)) 671 (called-interactively-p 'any))
672 (let* ((this (selected-frame)) 672 (let* ((this (selected-frame))
673 (mini (window-frame (minibuffer-window this)))) ; in case they difer 673 (mini (window-frame (minibuffer-window this)))) ; in case they differ
674 (dolist (frame (sort (frame-list) #'frameset-minibufferless-first-p)) 674 (dolist (frame (sort (frame-list) #'frameset-minibufferless-first-p))
675 (condition-case err 675 (condition-case err
676 (unless (or (eq frame this) 676 (unless (or (eq frame this)
@@ -1032,7 +1032,7 @@ being set (usually, by reading it from the desktop)."
1032 :force-onscreen desktop-restore-forces-onscreen))) 1032 :force-onscreen desktop-restore-forces-onscreen)))
1033 1033
1034;; Just to silence the byte compiler. 1034;; Just to silence the byte compiler.
1035;; Dynamicaly bound in `desktop-read'. 1035;; Dynamically bound in `desktop-read'.
1036(defvar desktop-first-buffer) 1036(defvar desktop-first-buffer)
1037(defvar desktop-buffer-ok-count) 1037(defvar desktop-buffer-ok-count)
1038(defvar desktop-buffer-fail-count) 1038(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
182;; Let's say that Emacs' frame parameters were never designed as a tool to 182;; Let's say that Emacs' frame parameters were never designed as a tool to
183;; precisely record (or restore) a frame's state. They grew organically, 183;; precisely record (or restore) a frame's state. They grew organically,
184;; and their uses and behaviors reflect their history. In using them to 184;; and their uses and behaviors reflect their history. In using them to
185;; implement framesets, the unwary implementor, or the prospective package 185;; implement framesets, the unwary implementer, or the prospective package
186;; writer willing to use framesets in their code, might fall victim of some 186;; writer willing to use framesets in their code, might fall victim of some
187;; unexpected... oddities. 187;; unexpected... oddities.
188;; 188;;
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."
3080 min-indent 3080 min-indent
3081 indent 3081 indent
3082 (if (<= indent children-indent-limit) 3082 (if (<= indent children-indent-limit)
3083 ;; This lays within the children indent offset range, 3083 ;; This lies within the children indent offset range,
3084 ;; so it's a normal children of its parent (i.e., not 3084 ;; so it's a normal child of its parent (i.e., not
3085 ;; a children of a children). 3085 ;; a child of a child).
3086 (cons (cons label pos) tree) 3086 (cons (cons label pos) tree)
3087 ;; Oh noes, a children of a children?!. Fear not, we 3087 ;; Oh no, a child of a child?! Fear not, we
3088 ;; know how to roll. We recursely parse these by 3088 ;; know how to roll. We recursively parse these by
3089 ;; swapping prev-indent and min-indent plus adding this 3089 ;; swapping prev-indent and min-indent plus adding this
3090 ;; newly found item to a fresh subtree. This works, I 3090 ;; newly found item to a fresh subtree. This works, I
3091 ;; promise. 3091 ;; promise.
3092 (cons 3092 (cons
3093 (python-imenu--build-tree 3093 (python-imenu--build-tree