diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-13 00:03:41 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-13 00:03:41 -0700 |
| commit | 7ebd31ee0740d85527a498100d1f14dad5e0350f (patch) | |
| tree | e2ca3fcb527b8a6cf62846ad764c9f1c22d27855 /src/doc.c | |
| parent | d83cf4ccb94a5d4ea15980d76f7b16ee19909200 (diff) | |
| parent | 2be4956d356f48ae65127679994a6ef6fa208914 (diff) | |
| download | emacs-7ebd31ee0740d85527a498100d1f14dad5e0350f.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/doc.c b/src/doc.c index 9fbeb0b5ed5..b5a57d7d6f2 100644 --- a/src/doc.c +++ b/src/doc.c @@ -118,14 +118,16 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition) 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; SAFE_ALLOCA (name, char *, minsize + SCHARS (file) + 8); - strcpy (name, SSDATA (Vdoc_directory)); + strcpy (name, SSDATA (docdir)); strcat (name, SSDATA (file)); } else @@ -140,7 +142,7 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition) 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)); |