[Emacs-diffs] /srv/bzr/emacs/trunk r106069: * doc.c (get_doc_string): Encode file name.

[Stefan Monnier]

------------------------------------------------------------
revno: 106069
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9735
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2011-10-12 15:08:04 -0400
message:
  * doc.c (get_doc_string): Encode file name.
modified:
  src/ChangeLog
  src/doc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-12 15:12:52 +0000
+++ b/src/ChangeLog     2011-10-12 19:08:04 +0000
@@ -1,3 +1,7 @@
+2011-10-12  Stefan Monnier  <address@hidden>
+
+       * doc.c (get_doc_string): Encode file name (bug#9735).
+
 2011-10-12  Eli Zaretskii  <address@hidden>
 
        * bidi.c (bidi_level_of_next_char):

=== modified file 'src/doc.c'
--- a/src/doc.c 2011-08-18 08:37:41 +0000
+++ b/src/doc.c 2011-10-12 19:08:04 +0000
@@ -116,14 +116,16 @@
      If it is relative, combine it with Vdoc_directory.  */
 
   tem = Ffile_name_absolute_p (file);
+  file = ENCODE_FILE (file);
   if (NILP (tem))
     {
-      minsize = SCHARS (Vdoc_directory);
+      Lisp_Object docdir = ENCODE_FILE (Vdoc_directory);
+      minsize = SCHARS (docdir);
       /* sizeof ("../etc/") == 8 */
       if (minsize < 8)
        minsize = 8;
       name = (char *) alloca (minsize + SCHARS (file) + 8);
-      strcpy (name, SSDATA (Vdoc_directory));
+      strcpy (name, SSDATA (docdir));
       strcat (name, SSDATA (file));
     }
   else
@@ -138,7 +140,7 @@
       if (!NILP (Vpurify_flag))
        {
          /* Preparing to dump; DOC file is probably not installed.
-            So check in ../etc. */
+            So check in ../etc.  */
          strcpy (name, "../etc/");
          strcat (name, SSDATA (file));