From ac0f1b8597ec67288cd1774f02b5c7ea44c3c73c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 23 Oct 2014 19:32:51 +0300 Subject: [PATCH] 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. --- lisp/ChangeLog | 5 +++++ lisp/startup.el | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d5c5458facf..d32c2772579 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-23 Eli Zaretskii + + * startup.el (fancy-about-text): Read the entire tutorial, not + just its first 256 bytes. (Bug#18760) + 2014-10-23 Stefan Monnier * emacs-lisp/bytecomp.el: Require cl-extra (bug#18804). diff --git a/lisp/startup.el b/lisp/startup.el index 58e970814b9..54ed53e69c8 100644 --- 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 -- 2.39.5