diff options
| author | Eli Zaretskii | 2012-07-20 13:29:32 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-07-20 13:29:32 +0300 |
| commit | 87ab808f0c0b2653a4a314d216c2afb44cfb2fc9 (patch) | |
| tree | 7f3704ad5ea32b5416c0aeb9c378cd30e3c0066b /lisp | |
| parent | d7ea76b4f34c4e2c43bf0b1deeedde354ca540f7 (diff) | |
| download | emacs-87ab808f0c0b2653a4a314d216c2afb44cfb2fc9.tar.gz emacs-87ab808f0c0b2653a4a314d216c2afb44cfb2fc9.zip | |
Fix display of Hebrew tutorial title on splash screen.
lisp/startup.el (fancy-startup-text): Read the whole tutorial, not
just its first 256 bytes. Prevents gibberish in display of the
tutorial title.
etc/tutorials/TUTORIAL.he: Make the first sentence display correctly
in a left-to-right paragraph, such as what is shown on the fancy
splash screen, by using directional control characters.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/startup.el | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f2b89c086dd..8edae88c1da 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-07-20 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * startup.el (fancy-startup-text): Read the whole tutorial, not | ||
| 4 | just its first 256 bytes. Prevents gibberish in display of the | ||
| 5 | tutorial title. | ||
| 6 | |||
| 1 | 2012-07-20 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2012-07-20 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 8 | ||
| 3 | Drop idle buffer compaction due to an absence of the | 9 | Drop idle buffer compaction due to an absence of the |
diff --git a/lisp/startup.el b/lisp/startup.el index 3adc2caa04a..e861a333a76 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -1311,7 +1311,15 @@ If this is nil, no message will be displayed." | |||
| 1311 | (title (with-temp-buffer | 1311 | (title (with-temp-buffer |
| 1312 | (insert-file-contents | 1312 | (insert-file-contents |
| 1313 | (expand-file-name tut tutorial-directory) | 1313 | (expand-file-name tut tutorial-directory) |
| 1314 | nil 0 256) | 1314 | ;; We used to read only the first 256 bytes of |
| 1315 | ;; the tutorial, but that prevents the coding: | ||
| 1316 | ;; setting, if any, in file-local variables | ||
| 1317 | ;; section to be seen by insert-file-contents, | ||
| 1318 | ;; and results in gibberish when the language | ||
| 1319 | ;; environment's preferred encoding is | ||
| 1320 | ;; different from what the file-local variable | ||
| 1321 | ;; says. One case in point is Hebrew. | ||
| 1322 | nil) | ||
| 1315 | (search-forward ".") | 1323 | (search-forward ".") |
| 1316 | (buffer-substring (point-min) (1- (point)))))) | 1324 | (buffer-substring (point-min) (1- (point)))))) |
| 1317 | ;; If there is a specific tutorial for the current language | 1325 | ;; If there is a specific tutorial for the current language |