[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 0cfb066 07/35: doc.c: us
From: |
Noah Friedman |
Subject: |
[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. |
Date: |
Mon, 8 May 2017 19:46:26 -0400 (EDT) |
branch: feature/aptel/dynamic-modules-rc3
commit 0cfb0665271fd364df9ad7378e435998a5f98326
Author: Aurélien Aptel <address@hidden>
Commit: Aurélien Aptel <address@hidden>
doc.c: use DOC format sanity checks instead of bytecompiled checks on
module doc files.
---
src/doc.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/doc.c b/src/doc.c
index f4aa0c5..bc74553 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -56,6 +56,15 @@ read_bytecode_char (bool unreadflag)
return *read_bytecode_pointer++;
}
+/* A module doc file must have a doc extension */
+static bool
+doc_is_from_module_p (const char* path)
+{
+ int len = strlen (path);
+ return len > 4 && (strcmp (path + len - 4, ".doc") == 0
+ || (strcmp (path + len - 4, ".DOC") == 0));
+}
+
/* Extract a doc string from a file. FILEPOS says where to get it.
If it is an integer, use that position in the standard DOC file.
If it is (FILE . INTEGER), use FILE as the file name
@@ -211,7 +220,7 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool
definition)
SAFE_FREE ();
/* Sanity checking. */
- if (CONSP (filepos))
+ if (CONSP (filepos) && !doc_is_from_module_p (name))
{
int test = 1;
/* A dynamic docstring should be either at the very beginning of a "#@
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 0526616 04/35: add sample module `fmod'., (continued)
- [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, 2017/05/08
- [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 <=
- [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
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9330ca6 12/35: new module: elisp, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9da7346 13/35: new module: curl. basic URL fetcher working., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 c7248ea 21/35: yaml module: rename `yaml-parse' to `yaml-parse-buffer'., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 a95e032 17/35: update modules examples with `provide' call., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 1959b65 18/35: use `load-module-suffixes' as a source of module suffixes., Noah Friedman, 2017/05/08