Merge remote-tracking branch 'origin/master' into for-steve

[sxemacs] / lisp / tty-init.el

diff --git a/lisp/tty-init.el b/lisp/tty-init.el
index 5851204..f92eff2 100644 (file)
--- a/lisp/tty-init.el
+++ b/lisp/tty-init.el
@@ -371,13 +371,13 @@
 (defvar tty-win-initted nil)
 
 (defun tty-color-list (&optional registered-only)
-  "Returns the list of colors the tty can handle. Since the tty will do color 
+  "Returns the list of colors the tty can handle. Since the tty will do color
 approximation, it will return all colors.
-When argument REGISTERED-ONLY is t `tty-color-list' will return only the 
+When argument REGISTERED-ONLY is t `tty-color-list' will return only the
 registered colors of the terminal."
   (if registered-only
       (tty-registered-color-list)
-    (nconc (tty-registered-color-list) 
+    (nconc (tty-registered-color-list)
           (x-color-list))))
 
 (defun init-tty-win ()