summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
authorJoakim Verona <joakim@verona.se>2011-12-28 04:12:56 +0100
committerJoakim Verona <joakim@verona.se>2011-12-28 04:12:56 +0100
commitbb29f044aa967831cd664c54eba0de0c701436ce (patch)
tree1398cc9780bbae0fdad071a3a3765a571c3f6d7b /lisp/term
parent3c935a7e996701244d166f684119f0ff97e25496 (diff)
parent5e605a2e528955721fc6f2bd7b9f174c15075fb1 (diff)
downloademacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.gz
emacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.bz2
emacs-bb29f044aa967831cd664c54eba0de0c701436ce.zip
upstream i think
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/common-win.el4
-rw-r--r--lisp/term/ns-win.el2
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index c13d22dde71..63c8840621c 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -281,11 +281,11 @@ have been processed."
;; The ordering of the colors is chosen for the user's convenience in
;; `list-colors-display', which displays the reverse of this list.
;; Roughly speaking, `list-colors-display' orders by (i) named shades
-;; of grey with hue 0.0, sorted by value (ii) named colors with
+;; of gray with hue 0.0, sorted by value (ii) named colors with
;; saturation 1.0, sorted by hue, (iii) named non-white colors with
;; saturation less than 1.0, sorted by hue, (iv) other named shades of
;; white, (v) numbered colors sorted by hue, and (vi) numbered shades
-;; of grey.
+;; of gray.
(declare-function ns-list-colors "nsfns.m" (&optional frame))
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 10c1c19e0c4..b639af7cda0 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -492,7 +492,7 @@ unless the current buffer is a scratch buffer."
command-line-default-directory)))
(file (find-file-noselect f))
(bufwin1 (get-buffer-window file 'visible))
- (bufwin2 (get-buffer-window "*scratch*" 'visibile)))
+ (bufwin2 (get-buffer-window "*scratch*" 'visible)))
(cond
(bufwin1
(select-frame (window-frame bufwin1))