From 9b831d8ae7d30a32322dd48c042ff4de0bec8b3f Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 6 Nov 2019 16:57:35 +0900 Subject: [PATCH 1/7] Add rst module Uses sphinx-mode and adds a few common bindings Signed-off-by: Rudi Grinberg --- modules/lang/rst/config.el | 16 ++++++++++++++++ modules/lang/rst/packages.el | 1 + 2 files changed, 17 insertions(+) create mode 100644 modules/lang/rst/config.el create mode 100644 modules/lang/rst/packages.el diff --git a/modules/lang/rst/config.el b/modules/lang/rst/config.el new file mode 100644 index 000000000..1b076cdef --- /dev/null +++ b/modules/lang/rst/config.el @@ -0,0 +1,16 @@ +(use-package! sphinx-mode + :init + (add-hook! 'rst-mode-hook #'sphinx-mode)) + +(use-package! rst + :config + (map! :localleader + :map rst-mode-map + (:prefix ("a" . "adjust") + ("a" #'rst-adjust + "r" #'rst-adjust-region)) + (:prefix ("t" . "table of contents") + ("t" #'rst-toc + "i" #'rst-toc-insert + "u" #'rst-toc-update + "f" #'rst-toc-follow-link)))) diff --git a/modules/lang/rst/packages.el b/modules/lang/rst/packages.el new file mode 100644 index 000000000..ff9563aa7 --- /dev/null +++ b/modules/lang/rst/packages.el @@ -0,0 +1 @@ +(package! sphinx-mode) From 45f8972cdc327c28cc445a39485fcb385b1d5529 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 8 Nov 2019 12:50:38 +0900 Subject: [PATCH 2/7] add headers Signed-off-by: Rudi Grinberg --- modules/lang/rst/config.el | 2 ++ modules/lang/rst/packages.el | 3 +++ 2 files changed, 5 insertions(+) diff --git a/modules/lang/rst/config.el b/modules/lang/rst/config.el index 1b076cdef..2460ac74a 100644 --- a/modules/lang/rst/config.el +++ b/modules/lang/rst/config.el @@ -1,3 +1,5 @@ +;;; lang/rst/config.el -*- lexical-binding: t; -*- + (use-package! sphinx-mode :init (add-hook! 'rst-mode-hook #'sphinx-mode)) diff --git a/modules/lang/rst/packages.el b/modules/lang/rst/packages.el index ff9563aa7..b4f32ff0b 100644 --- a/modules/lang/rst/packages.el +++ b/modules/lang/rst/packages.el @@ -1 +1,4 @@ +;; -*- no-byte-compile: t; -*- +;;; lang/rst/packages.el + (package! sphinx-mode) From b1341f5668a4fe54ea45bbaa772dbb03da2bd709 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 8 Nov 2019 12:50:44 +0900 Subject: [PATCH 3/7] Use use-package's :hook Signed-off-by: Rudi Grinberg --- modules/lang/rst/config.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/lang/rst/config.el b/modules/lang/rst/config.el index 2460ac74a..87ec00a63 100644 --- a/modules/lang/rst/config.el +++ b/modules/lang/rst/config.el @@ -1,8 +1,7 @@ ;;; lang/rst/config.el -*- lexical-binding: t; -*- (use-package! sphinx-mode - :init - (add-hook! 'rst-mode-hook #'sphinx-mode)) + :hook (rst-mode . sphinx-mode)) (use-package! rst :config From 487b53ab5d26152beb4d17403723ff21e7f20942 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 8 Nov 2019 12:51:57 +0900 Subject: [PATCH 4/7] remove unnecessary parens Signed-off-by: Rudi Grinberg --- modules/lang/rst/config.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lang/rst/config.el b/modules/lang/rst/config.el index 87ec00a63..25a58b029 100644 --- a/modules/lang/rst/config.el +++ b/modules/lang/rst/config.el @@ -8,8 +8,8 @@ (map! :localleader :map rst-mode-map (:prefix ("a" . "adjust") - ("a" #'rst-adjust - "r" #'rst-adjust-region)) + "a" #'rst-adjust + "r" #'rst-adjust-region) (:prefix ("t" . "table of contents") ("t" #'rst-toc "i" #'rst-toc-insert From ba11f046bfca4e7360d2dd38be712fa45168f925 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 8 Nov 2019 12:54:10 +0900 Subject: [PATCH 5/7] Use ox-rst when :lang rst is enabled Signed-off-by: Rudi Grinberg --- modules/lang/org/packages.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index 6e04f10b8..f4f4cd52a 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -58,3 +58,5 @@ (when (featurep! +hugo) (package! ox-hugo :recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t))) +(when (featurep! :lang rst) + (package! ox-rst)) From 1f53ee92cb9c3843c6027b7e6642ccf28276203b Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 8 Nov 2019 12:56:14 +0900 Subject: [PATCH 6/7] lazy load rst Signed-off-by: Rudi Grinberg --- modules/lang/rst/config.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/lang/rst/config.el b/modules/lang/rst/config.el index 25a58b029..77cec504d 100644 --- a/modules/lang/rst/config.el +++ b/modules/lang/rst/config.el @@ -4,6 +4,7 @@ :hook (rst-mode . sphinx-mode)) (use-package! rst + :defer t :config (map! :localleader :map rst-mode-map From 7034b22e0dea3a0d0e44ca6fbac8e147e361a1a0 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sun, 10 Nov 2019 14:14:23 +0900 Subject: [PATCH 7/7] remove extra level of parens Signed-off-by: Rudi Grinberg --- modules/lang/rst/config.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/lang/rst/config.el b/modules/lang/rst/config.el index 77cec504d..34ea7a0b5 100644 --- a/modules/lang/rst/config.el +++ b/modules/lang/rst/config.el @@ -12,7 +12,7 @@ "a" #'rst-adjust "r" #'rst-adjust-region) (:prefix ("t" . "table of contents") - ("t" #'rst-toc - "i" #'rst-toc-insert - "u" #'rst-toc-update - "f" #'rst-toc-follow-link)))) + "t" #'rst-toc + "i" #'rst-toc-insert + "u" #'rst-toc-update + "f" #'rst-toc-follow-link)))