branch: externals/m-buffer
commit ac1adbf0ec7a274d54195fa8e4d35b3949adc98b
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Try and make it possible to build the doc on elpa.gnu.org
* Makefile (EMACS_ENV): Allow spaces in $EMACS.
(just-test): Use CWD rather than `.`.
(doc-gen): Use `--batch` rather than `--script` because it handles
`--directory` differently.
* m-buffer-doc.org: Add info for Texinfo's direentry.
* dev/doc-gen.el: Don't depend on `load-relative`.
---
Makefile | 14 +++++++-------
dev/doc-gen.el | 10 ++++------
m-buffer-doc.org | 6 ++++++
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 2dcd53345a..ba86e1da9d 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ EMACSES=there-is-no-sensible-default-here
-include makefile-local
ifdef EMACS
-EMACS_ENV=EMACS=$(EMACS)
+EMACS_ENV=EMACS="$(EMACS)"
endif
@@ -16,9 +16,9 @@ install:
$(EMACS_ENV) $(CASK) install
just-test:
- $(EMACS_ENV) $(CASK) emacs --batch -q \
- --directory=. \
- --load "dev/fudge-discover" \
+ $(EMACS_ENV) $(CASK) $(EMACS) --batch \
+ --directory="$(PWD)" \
+ --load "dev/fudge-discover" \
--funcall fudge-discover-run-and-exit-batch
test: install just-test
@@ -27,9 +27,9 @@ package:
$(EMACS_ENV) $(CASK) package
doc-gen:
- $(EMACS_ENV) $(CASK) emacs \
- --directory=. \
- --script dev/doc-gen.el -f doc-gen
+ $(EMACS_ENV) $(CASK) $(EMACS) --batch \
+ --directory="$(PWD)" \
+ -l dev/doc-gen.el -f doc-gen
publish-doc: ../m-buffer-pages/index.html ../m-buffer-pages/m-buffer-doc.css
diff --git a/dev/doc-gen.el b/dev/doc-gen.el
index bc3992e901..f5309a8290 100644
--- a/dev/doc-gen.el
+++ b/dev/doc-gen.el
@@ -1,12 +1,10 @@
;; -*- lexical-binding: t; -*-
-;; Copyright (C) 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2022-2024 Free Software Foundation, Inc.
-(require 'load-relative)
-
-(require-relative "../m-buffer-macro")
-(require-relative "../m-buffer")
-(require-relative "../m-buffer-at")
+(require 'm-buffer-macro)
+(require 'm-buffer)
+(require 'm-buffer-at)
(require 'lentic-doc nil t)
diff --git a/m-buffer-doc.org b/m-buffer-doc.org
index d862903389..fa65819a00 100644
--- a/m-buffer-doc.org
+++ b/m-buffer-doc.org
@@ -1,6 +1,12 @@
#+TITLE: Manipulate the Contents of Emacs Buffers
#+AUTHOR: Phillip Lord
+#+TEXINFO_DIR_CATEGORY: Emacs
+
+# FIXME: Shouldn't `ox-texinfo` use sane defaults like the file's name
+# for TEXINFO_DIR_TITLE and the TITLE for TEXINFO_DIR_DESC?
+#+TEXINFO_DIR_TITLE: m-buffer-doc
+#+TEXINFO_DIR_DESC: Manipulate the Contents of Emacs Buffers
#+INFOJS_OPT: view:info toc:nil
