[Emacs-diffs] /srv/bzr/emacs/trunk r109165: Fix display of Hebrew tutorial title on splash screen.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109165
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-20 13:29:32 +0300
message:
  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.
modified:
  etc/ChangeLog
  etc/tutorials/TUTORIAL.he
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2012-07-15 00:52:16 +0000
+++ b/etc/ChangeLog     2012-07-20 10:29:32 +0000
@@ -1,3 +1,9 @@
+2012-07-20  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * NEWS: Mention exclamation-mark and flymake.

=== modified file 'etc/tutorials/TUTORIAL.he'
--- a/etc/tutorials/TUTORIAL.he 2012-01-14 11:23:45 +0000
+++ b/etc/tutorials/TUTORIAL.he 2012-07-20 10:29:32 +0000
@@ -1,4 +1,4 @@
-שיעור ראשון בשימוש ב־Emacs. זכויות שימוש ראה בסוף המסמך.
+שיעור ראשון בשימוש ב־‫Emacs‬. זכויות שימוש ראה בסוף המסמך.
 
 פקודות רבות של Emacs משתמשות במקש CONTROL (לפעמים הוא מסומן ב־CTRL או CTL)
 או במקש META (לפעמים מסומן EDIT או ALT). במקום לציין את כל השמות האפשריים

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-20 04:13:04 +0000
+++ b/lisp/ChangeLog    2012-07-20 10:29:32 +0000
@@ -1,3 +1,9 @@
+2012-07-20  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        Drop idle buffer compaction due to an absence of the

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2012-06-22 21:24:54 +0000
+++ b/lisp/startup.el   2012-07-20 10:29:32 +0000
@@ -1311,7 +1311,15 @@
              (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