Fix bug #18760 with incorrect decoding of tutorial for "About Emacs" screen.

 lisp/startup.el (fancy-about-text): Read the entire tutorial, not
 just its first 256 bytes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5c5458facfbe2c78dd848ba8c1ce1024476bd1e..d32c2772579f4c1795bd8ef4810320bc5ac50e6e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-23  Eli Zaretskii  <eliz@gnu.org>
+
+       * startup.el (fancy-about-text): Read the entire tutorial, not
+       just its first 256 bytes.  (Bug#18760)
+
 2014-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/bytecomp.el: Require cl-extra (bug#18804).

diff --git a/lisp/startup.el b/lisp/startup.el
index 58e970814b9842b3fce1c8329f5211821db29e69..54ed53e69c8e65d069b0fdbb20a6194a3079a1e1 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1523,7 +1523,10 @@ Each element in the list should be a list of strings or pairs
              (title (with-temp-buffer
                       (insert-file-contents
                        (expand-file-name tut tutorial-directory)
-                       nil 0 256)
+                       ;; Reat the entire file, to make sure any
+                       ;; coding cookies and other local variables
+                       ;; get acted upon.
+                       nil)
                       (search-forward ".")
                       (buffer-substring (point-min) (1- (point))))))
         ;; If there is a specific tutorial for the current language