[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 b8286d2 08/35: doc.c: do
From: |
Noah Friedman |
Subject: |
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 b8286d2 08/35: doc.c: don't prefix doc path by ../etc/ for modules |
Date: |
Mon, 8 May 2017 19:46:26 -0400 (EDT) |
branch: feature/aptel/dynamic-modules-rc3
commit b8286d22206981b277629eea7f4a8ec219663997
Author: Aurélien Aptel <address@hidden>
Commit: Aurélien Aptel <address@hidden>
doc.c: don't prefix doc path by ../etc/ for modules
---
src/doc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/doc.c b/src/doc.c
index bc74553..5290b5d 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -118,11 +118,11 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool
definition)
return Qnil;
/* Put the file name in NAME as a C string.
- If it is relative, combine it with Vdoc_directory. */
+ If it is relative and not from a module, combine it with Vdoc_directory.
*/
tem = Ffile_name_absolute_p (file);
file = ENCODE_FILE (file);
- if (NILP (tem))
+ if (NILP (tem) && !doc_is_from_module_p (SSDATA (file)))
{
Lisp_Object docdir = ENCODE_FILE (Vdoc_directory);
minsize = SCHARS (docdir);
- [Emacs-diffs] branch feature/aptel/dynamic-modules-rc3 created (now c59f2de), Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 fc0f6ec 02/35: add `load-module' function to emacs lisp., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 0526616 04/35: add sample module `fmod'., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 19705b8 06/35: alloc.c: protect doc field from GC., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 1b98be3 09/35: move fmod module in modules/fmod/., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 772cb16 01/35: add libltdl configure option/dependency., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 6478a32 03/35: intern literal strings as regular string., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 b8286d2 08/35: doc.c: don't prefix doc path by ../etc/ for modules,
Noah Friedman <=
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 89c8287 11/35: opaque: add comments., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 79e2c28 05/35: change Subr doc field from char* to Lisp_Object., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 8254721 16/35: make `load' look for and handle dynamic modules., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 092a6d2 22/35: configure.ac: dynamic modules off by default., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 0cfb066 07/35: doc.c: use DOC format sanity checks instead of bytecompiled checks on module doc files., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 4000103 20/35: yaml module: add `yaml-parse-string'., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 4e1ad37 19/35: new yaml parsing module using libyaml, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 8147699 15/35: fix docstring., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 bfe16af 10/35: new module: opaque, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 582704c 14/35: curl: use url arg., Noah Friedman, 2017/05/08