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.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5c5f85a1a25ec3da708f3eacbd83b1823bafb170..15cc0065da7f673e3e7398c902c2c2c5dacf64cc 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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.
+
 2012-07-15  Leo Liu  <sdl.web@gmail.com>
 
        * NEWS: Mention exclamation-mark and flymake.

diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index cb82f87f765dcd4b9a2cf8852933dbbbec7d67cc..e0c85a379a96ab5d34e8522a664cd9a87b4afb6c 100644 (file)
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -1,4 +1,4 @@
-שיעור ראשון בשימוש ב־Emacs. זכויות שימוש ראה בסוף המסמך.
+שיעור ראשון בשימוש ב־‫Emacs‬. זכויות שימוש ראה בסוף המסמך.
 
 פקודות רבות של Emacs משתמשות במקש CONTROL (לפעמים הוא מסומן ב־CTRL או CTL)
 או במקש META (לפעמים מסומן EDIT או ALT). במקום לציין את כל השמות האפשריים

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2b89c086ddda8aa9c06293f22cbc50e0b06ece0..8edae88c1da83aee674771bd90fe0f172b61eb96 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * startup.el (fancy-startup-text): Read the whole tutorial, not
+       just its first 256 bytes.  Prevents gibberish in display of the
+       tutorial title.
+
 2012-07-20  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Drop idle buffer compaction due to an absence of the

diff --git a/lisp/startup.el b/lisp/startup.el
index 3adc2caa04a70f0d3b071a4fe11b6198901623d7..e861a333a76be7ccb5d68845b9944adb91a8af07 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1311,7 +1311,15 @@ If this is nil, no message will be displayed."
              (title (with-temp-buffer
                       (insert-file-contents
                        (expand-file-name tut tutorial-directory)
-                       nil 0 256)
+                       ;; We used to read only the first 256 bytes of
+                       ;; the tutorial, but that prevents the coding:
+                       ;; setting, if any, in file-local variables
+                       ;; section to be seen by insert-file-contents,
+                       ;; and results in gibberish when the language
+                       ;; environment's preferred encoding is
+                       ;; different from what the file-local variable
+                       ;; says.  One case in point is Hebrew.
+                       nil)
                       (search-forward ".")
                       (buffer-substring (point-min) (1- (point))))))
         ;; If there is a specific tutorial for the current language