[Emacs-diffs] emacs-24 r117621: Fix bug #18760 with incorrect decoding of tutorial for "About Emacs" screen.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117621
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18760
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-10-23 19:32:51 +0300
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/startup.el                startup.el-20091113204419-o5vbwnq5f7feedwu-260

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-23 13:31:20 +0000
+++ b/lisp/ChangeLog    2014-10-23 16:32:51 +0000
@@ -1,3 +1,8 @@
+2014-10-23  Eli Zaretskii  <address@hidden>
+
+       * startup.el (fancy-about-text): Read the entire tutorial, not
+       just its first 256 bytes.  (Bug#18760)
+
 2014-10-23  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/bytecomp.el: Require cl-extra (bug#18804).

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2014-08-29 22:13:43 +0000
+++ b/lisp/startup.el   2014-10-23 16:32:51 +0000
@@ -1523,7 +1523,10 @@
              (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