From 415604c7a77205d91254a271f0112f69729eb3a9 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Wed, 6 Mar 2024 16:43:45 +0100 Subject: [PATCH] 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. --- Makefile.in | 4 ++-- admin/syncdoc-type-hierarchy.el | 4 ++-- doc/lispref/Makefile.in | 6 +++--- ...{type_hierarchy.jpg => elisp_type_hierarchy.jpg} | Bin ...{type_hierarchy.txt => elisp_type_hierarchy.txt} | 0 doc/lispref/objects.texi | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename doc/lispref/{type_hierarchy.jpg => elisp_type_hierarchy.jpg} (100%) rename doc/lispref/{type_hierarchy.txt => elisp_type_hierarchy.txt} (100%) diff --git a/Makefile.in b/Makefile.in index 6f014909307..20394cb333d 100644 --- 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 b8cd71fe84e..b5cfdfd8e74 100644 --- 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 4c6b14593ff..9b7b6d8ea9d 100644 --- 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/type_hierarchy.jpg b/doc/lispref/elisp_type_hierarchy.jpg similarity index 100% rename from doc/lispref/type_hierarchy.jpg rename to doc/lispref/elisp_type_hierarchy.jpg diff --git a/doc/lispref/type_hierarchy.txt b/doc/lispref/elisp_type_hierarchy.txt similarity index 100% rename from doc/lispref/type_hierarchy.txt rename to doc/lispref/elisp_type_hierarchy.txt diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index dd212ef700c..41171bcaafc 100644 --- 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}.