diff options
| author | Eli Zaretskii | 2014-10-23 19:32:51 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-23 19:32:51 +0300 |
| commit | ac0f1b8597ec67288cd1774f02b5c7ea44c3c73c (patch) | |
| tree | 0e9bcd201b5df7c8585e23c4cb02eacb2289256b | |
| parent | acc443ad03bf46aa49c87bc93f2df836bedede94 (diff) | |
| download | emacs-ac0f1b8597ec67288cd1774f02b5c7ea44c3c73c.tar.gz emacs-ac0f1b8597ec67288cd1774f02b5c7ea44c3c73c.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/startup.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d5c5458facf..d32c2772579 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-10-23 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * startup.el (fancy-about-text): Read the entire tutorial, not | ||
| 4 | just its first 256 bytes. (Bug#18760) | ||
| 5 | |||
| 1 | 2014-10-23 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-10-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacs-lisp/bytecomp.el: Require cl-extra (bug#18804). | 8 | * 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 | |||
| 1523 | (title (with-temp-buffer | 1523 | (title (with-temp-buffer |
| 1524 | (insert-file-contents | 1524 | (insert-file-contents |
| 1525 | (expand-file-name tut tutorial-directory) | 1525 | (expand-file-name tut tutorial-directory) |
| 1526 | nil 0 256) | 1526 | ;; Reat the entire file, to make sure any |
| 1527 | ;; coding cookies and other local variables | ||
| 1528 | ;; get acted upon. | ||
| 1529 | nil) | ||
| 1527 | (search-forward ".") | 1530 | (search-forward ".") |
| 1528 | (buffer-substring (point-min) (1- (point)))))) | 1531 | (buffer-substring (point-min) (1- (point)))))) |
| 1529 | ;; If there is a specific tutorial for the current language | 1532 | ;; If there is a specific tutorial for the current language |