Rename type_hierarchy.* -> elisp_type_hierarchy.*

* doc/lispref/elisp_type_hierarchy.txt: Renamed.
* doc/lispref/elisp_type_hierarchy.jpg: Likewise.
* doc/lispref/Makefile.in (auxfiles)
($(buildinfodir)/elisp_type_hierarchy.txt)
($(buildinfodir)/elisp_type_hierarchy.jpg): Update.
* admin/syncdoc-type-hierarchy.el (syncdoc-update-type-hierarchy0): Likewise.
* Makefile.in (install-info, uninstall): Likewise.

(cherry picked from commit 415604c7a77205d91254a271f0112f69729eb3a9)

diff --git a/Makefile.in b/Makefile.in
index 6f014909307c1fd557078548fd8d3f8944bfbdc3..20394cb333dc894e67172b001c89ceb77d3e0796 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -812,7 +812,7 @@ install-info: info
              done; \
             (cd "$${thisdir}"; \
              ${INSTALL_INFO} --info-dir="$(DESTDIR)${infodir}" "$(DESTDIR)${infodir}/$$elt"); \
-             cp type_hierarchy* $(DESTDIR)${infodir}/; \
+             cp elisp_type_hierarchy* $(DESTDIR)${infodir}/; \
           done; \
        fi
 
@@ -955,7 +955,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas
                ext=.gz; else ext=; fi; \
             rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \
           done; \
-          rm -f type_hierarchy.jpg type_hierarchy.txt; \
+          rm -f elisp_type_hierarchy.jpg elisp_type_hierarchy.txt; \
         fi)
        (if [ -n "${GZIP_PROG}" ]; then \
            ext=.gz; else ext=; fi; \

diff --git a/admin/syncdoc-type-hierarchy.el b/admin/syncdoc-type-hierarchy.el
index b8cd71fe84e891e57b929417c69c1de1baacbdff..b5cfdfd8e74aebb1cdcf89caded30f02d648e1d9 100644 (file)
--- a/admin/syncdoc-type-hierarchy.el
+++ b/admin/syncdoc-type-hierarchy.el
@@ -114,9 +114,9 @@
     (syncdoc-insert-dot-content "LR")
     (with-demoted-errors "%S"           ;In case "dot" is not found!
       (call-process-region nil nil "dot" t (current-buffer) nil "-Tjpg" "-o"
-                           (expand-file-name "type_hierarchy.jpg"
+                           (expand-file-name "elisp_type_hierarchy.jpg"
                                              syncdoc-lispref-dir))))
-  (syncdoc-make-type-table (expand-file-name "type_hierarchy.txt"
+  (syncdoc-make-type-table (expand-file-name "elisp_type_hierarchy.txt"
                                              syncdoc-lispref-dir)))
 
 (defun syncdoc-update-type-hierarchy ()

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 4c6b14593ff7b28df9d9396f30222c30c008cd82..9b7b6d8ea9ddd022c900dee7744f61e41dea7664 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -144,12 +144,12 @@ ps: $(PS_TARGETS)
 ${buildinfodir}:
        ${MKDIR_P} $@
 
-auxfiles: $(buildinfodir)/type_hierarchy.txt $(buildinfodir)/type_hierarchy.jpg
+auxfiles: $(buildinfodir)/elisp_type_hierarchy.txt $(buildinfodir)/elisp_type_hierarchy.jpg
 
-$(buildinfodir)/type_hierarchy.txt: $(srcdir)/type_hierarchy.txt | ${buildinfodir}
+$(buildinfodir)/elisp_type_hierarchy.txt: $(srcdir)/elisp_type_hierarchy.txt | ${buildinfodir}
        cp $< $@
 
-$(buildinfodir)/type_hierarchy.jpg: $(srcdir)/type_hierarchy.jpg | ${buildinfodir}
+$(buildinfodir)/elisp_type_hierarchy.jpg: $(srcdir)/elisp_type_hierarchy.jpg | ${buildinfodir}
        cp $< $@
 
 $(buildinfodir)/elisp.info: $(srcs) auxfiles | ${buildinfodir}

diff --git a/doc/lispref/elisp_type_hierarchy.jpg b/doc/lispref/elisp_type_hierarchy.jpg
new file mode 100644 (file)
index 0000000..5182555
Binary files /dev/null and b/doc/lispref/elisp_type_hierarchy.jpg differ

diff --git a/doc/lispref/elisp_type_hierarchy.txt b/doc/lispref/elisp_type_hierarchy.txt
new file mode 100644 (file)
index 0000000..00b6bb9
--- /dev/null
+++ b/doc/lispref/elisp_type_hierarchy.txt
@@ -0,0 +1,29 @@
+| Type                | Derived Types                                              |
+|---------------------+------------------------------------------------------------|
+| cl-structure-object | xref-elisp-location org-cite-processor cl--generic-method  |
+|                     | cl--random-state register-preview-info cl--generic         |
+|                     | cl--class cl-slot-descriptor uniquify-item registerv       |
+|                     | isearch--state cl--generic-generalizer lisp-indent-state   |
+| accessor            | oclosure-accessor                                          |
+| oclosure            | advice cconv--interactive-helper advice--forward accessor  |
+|                     | save-some-buffers-function cl--generic-nnm                 |
+| atom                | ppss decoded-time oclosure cl-structure-object timer       |
+|                     | native-comp-unit obarray symbol number-or-marker overlay   |
+|                     | window-configuration process window buffer frame           |
+|                     | hash-table terminal thread mutex condvar font-spec         |
+|                     | font-entity font-object user-ptr tree-sitter-parser        |
+|                     | tree-sitter-node tree-sitter-compiled-query function array |
+| cl--class           | cl-structure-class oclosure--class                         |
+| subr                | subr-primitive subr-native-elisp                           |
+| function            | compiled-function module-function                          |
+| compiled-function   | subr byte-code-function                                    |
+| list                | cons null                                                  |
+| boolean             | null                                                       |
+| array               | string char-table bool-vector vector                       |
+| symbol              | symbol-with-pos boolean keyword                            |
+| integer             | fixnum bignum                                              |
+| number-or-marker    | number integer-or-marker                                   |
+| integer-or-marker   | marker integer                                             |
+| number              | integer float                                              |
+| sequence            | array list                                                 |
+| t                   | atom sequence                                              |

diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index dd212ef700caa38dd3f35a48684b725b21825f8d..41171bcaafcfc1ca198e4a6eec9d98466a48e95e 100644 (file)
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -2516,7 +2516,7 @@ The Lisp Type Hierarchy for primitive types can be represented as
 follows:
 
 @noindent
-@image{type_hierarchy,,,,.jpg}
+@image{elisp_type_hierarchy,,,,.jpg}
 
 For example type @code{list} derives from (is a special kind of) type
 @code{sequence} which itself derives from @code{t}.

diff --git a/doc/lispref/type_hierarchy.jpg b/doc/lispref/type_hierarchy.jpg
deleted file mode 100644 (file)
index 5182555..0000000
Binary files a/doc/lispref/type_hierarchy.jpg and /dev/null differ

diff --git a/doc/lispref/type_hierarchy.txt b/doc/lispref/type_hierarchy.txt
deleted file mode 100644 (file)
index 00b6bb9..0000000
--- a/doc/lispref/type_hierarchy.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-| Type                | Derived Types                                              |
-|---------------------+------------------------------------------------------------|
-| cl-structure-object | xref-elisp-location org-cite-processor cl--generic-method  |
-|                     | cl--random-state register-preview-info cl--generic         |
-|                     | cl--class cl-slot-descriptor uniquify-item registerv       |
-|                     | isearch--state cl--generic-generalizer lisp-indent-state   |
-| accessor            | oclosure-accessor                                          |
-| oclosure            | advice cconv--interactive-helper advice--forward accessor  |
-|                     | save-some-buffers-function cl--generic-nnm                 |
-| atom                | ppss decoded-time oclosure cl-structure-object timer       |
-|                     | native-comp-unit obarray symbol number-or-marker overlay   |
-|                     | window-configuration process window buffer frame           |
-|                     | hash-table terminal thread mutex condvar font-spec         |
-|                     | font-entity font-object user-ptr tree-sitter-parser        |
-|                     | tree-sitter-node tree-sitter-compiled-query function array |
-| cl--class           | cl-structure-class oclosure--class                         |
-| subr                | subr-primitive subr-native-elisp                           |
-| function            | compiled-function module-function                          |
-| compiled-function   | subr byte-code-function                                    |
-| list                | cons null                                                  |
-| boolean             | null                                                       |
-| array               | string char-table bool-vector vector                       |
-| symbol              | symbol-with-pos boolean keyword                            |
-| integer             | fixnum bignum                                              |
-| number-or-marker    | number integer-or-marker                                   |
-| integer-or-marker   | marker integer                                             |
-| number              | integer float                                              |
-| sequence            | array list                                                 |
-| t                   | atom sequence                                              |