* play/animate.el (animate-string): For good effect, make sure

  `indent-tabs-mode' and `show-trailing-whitespace' are nil.

* play/animate.el (animate-sequence, animate-birthday-present):
* misc.el (butterfly): Don't set `indent-tabs-mode'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3b7b28361c45b7d097c2a4897372721880d3b3a..77482ef548a6769be1b26aeddc46bff43fad238b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-06  Juanma Barranquero  <lekktu@gmail.com>
+
+       * play/animate.el (animate-string): For good effect, make sure
+       `indent-tabs-mode' and `show-trailing-whitespace' are nil.
+
+       * play/animate.el (animate-sequence, animate-birthday-present):
+       * misc.el (butterfly): Don't set `indent-tabs-mode'.
+
 2009-10-06  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/byte-run.el (define-obsolete-face-alias): Doc fix.

diff --git a/lisp/misc.el b/lisp/misc.el
index c393e732b674548b2cc522766e5b5c4ce7b2a034..ffc1929a16976417a42f284b1bcae972b0447786 100644 (file)
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -122,7 +122,6 @@ variation of `C-x M-c M-butterfly' from url `http://xkcd.com/378/'."
        (switch-to-buffer (get-buffer-create "*butterfly*"))
        (erase-buffer)
        (sit-for 0)
-       (setq indent-tabs-mode nil)
        (animate-string "Amazing physics going on..."
                        (/ (window-height) 2) (- (/ (window-width) 2) 12))
        (sit-for (* 5 (/ (abs (random)) (float most-positive-fixnum))))

diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index cd4183ba66e9fd4041e4f1e0300c907ffed0cc01..d31fa0f7eb78ef6ea63bbbb957c09328842330ef 100644 (file)
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -105,7 +105,11 @@ in the current window."
                             (or hpos
                                 ;; HPOS unspecified, so compute
                                 ;; it so as to center the string.
-                                (max 0 (/ (- (window-width) (length string)) 2))))))
+                                (max 0 (/ (- (window-width) (length string)) 2)))))
+       (show-trailing-whitespace nil)
+       ;; Make sure indentation does not use tabs.
+       ;; They would confuse things.
+       (indent-tabs-mode nil))
     (dotimes (i animate-n-steps)
       ;; Bind buffer-undo-list so it will be unchanged when we are done.
       ;; (We're going to undo all our changes anyway.)
@@ -145,7 +149,6 @@ Strings will be separated from each other by SPACE lines."
     (switch-to-buffer (get-buffer-create "*Animation*"))
     (erase-buffer)
     (sit-for 0)
-    (setq indent-tabs-mode nil)
     (while list-of-strings
       (animate-string (car list-of-strings) vpos)
       (setq vpos (+ vpos space 1))
@@ -162,9 +165,6 @@ You can specify the one's name by NAME; the default value is \"Sarah\"."
   (erase-buffer)
   ;; Display the empty buffer.
   (sit-for 0)
-  ;; Make sure indentation does not use tabs.
-  ;; They would confuse things.
-  (setq indent-tabs-mode nil)
 
   (animate-string "Happy Birthday," 6)
   (animate-string (format "%s" name) 7)