From 093ddcc57e572b44545965969b7dcc38fcb4805d Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Tue, 9 May 2023 09:30:06 +0200 Subject: [PATCH] added orgalist and fixed markdown hooks --- conf-lisp/markdown.el | 39 +++++++++++++++++-------- conf-lisp/orgalist.el | 2 ++ init.el | 1 + init/46-orgalist.el | 1 + init/{27-markdown.el => 48-markdown.el} | 0 init/70-kubernetes.el | 1 + 6 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 conf-lisp/orgalist.el create mode 120000 init/46-orgalist.el rename init/{27-markdown.el => 48-markdown.el} (100%) create mode 120000 init/70-kubernetes.el diff --git a/conf-lisp/markdown.el b/conf-lisp/markdown.el index e5dc5c0..15b4295 100644 --- a/conf-lisp/markdown.el +++ b/conf-lisp/markdown.el @@ -8,8 +8,7 @@ (defun tvd-cleanup-org-tables () (save-excursion (goto-char (point-min)) - (while (search-forward "-+-" nil t) (replace-match "-|-")) - )) + (while (search-forward "-+-" nil t) (replace-match "-|-")))) (defun tvd-markdown-todo () "Create dynamically highlighted TODO list of MD list" @@ -18,23 +17,39 @@ (highlight-regexp "^- .*ok" "hi-green") (highlight-regexp "^- .*fail" "hi-pink")) +(defun tvd-markdown-cleanup() + "Convert org table into markdown table if in markdown-mode and +save the buffer [again], also check if parens are balanced" + (when (equal major-mode 'markdown-mode) + (when (check-parens) + (tvd-cleanup-org-tables) + (save-buffer)))) + (use-package markdown-mode :mode "\\.text\\'" :mode "\\.markdown\\'" :mode "\\.md\\'" :config - (defun tvd-markdown-hooks () - (when buffer-file-name - (add-hook 'after-save-hook - 'check-parens - nil t) - (add-hook 'after-save-hook 'tvd-cleanup-org-tables nil 'make-it-local)) + (modify-syntax-entry ?\" "\"" markdown-mode-syntax-table) - (modify-syntax-entry ?\" "\"" markdown-mode-syntax-table) + ;; (defun tvd-markdown-hooks () + ;; (when buffer-file-name + ;; (add-hook 'after-save-hook + ;; 'check-parens + ;; nil t) + ;; (add-hook 'after-save-hook 'tvd-cleanup-org-tables nil 'make-it-local)) - (when (fboundb 'orgtbl-mode) - (add-hook 'markdown-mode-hook 'orgtbl-mode))) + ;; (modify-syntax-entry ?\" "\"" markdown-mode-syntax-table) - :hook tvd-markdown-hooks + ;; (when (fboundb 'orgtbl-mode) + ;; (add-hook 'markdown-mode-hook 'orgtbl-mode)) + + ;; ;; (when (fboundb 'orgalist)) + ;; (add-hook 'markdown-mode-hook 'orgalist-mode)) + + :hook ;; tvd-markdown-hooks + (markdown-mode . orgalist-mode) + (markdown-mode . orgtbl-mode) + (after-save . tvd-markdown-cleanup-orgtables) ) diff --git a/conf-lisp/orgalist.el b/conf-lisp/orgalist.el new file mode 100644 index 0000000..995efab --- /dev/null +++ b/conf-lisp/orgalist.el @@ -0,0 +1,2 @@ +;; https://elpa.gnu.org/packages/orgalist.html +(use-package orgalist) diff --git a/init.el b/init.el index 1551129..14bc7e8 100644 --- a/init.el +++ b/init.el @@ -163,6 +163,7 @@ ;; If there is more than one, they won't work right. '(custom-safe-themes '("7f1d414afda803f3244c6fb4c2c64bea44dac040ed3731ec9d75275b9e831fe5" default)) + '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'") '(package-selected-packages '(blamer howm tiny tramp dictcc beacon which-key goto-last-change browse-kill-ring fringe-current-line swiper smex undo-tree fic-mode cmake-mode yaml-mode windresize web-mode use-package tablist solarized-theme smartparens rust-mode projectile persistent-scratch org-bullets markdown-mode magit iedit ibuffer-vc ibuffer-tramp hydra htmlize highlight-indentation go-mode eyebrowse elmacro dumb-jump dired-ranger dired-k dired-filter default-text-scale change-inner buffer-move)) '(safe-local-variable-values '((ruby-indent-level 4))) diff --git a/init/46-orgalist.el b/init/46-orgalist.el new file mode 120000 index 0000000..4b56e98 --- /dev/null +++ b/init/46-orgalist.el @@ -0,0 +1 @@ +../conf-lisp/orgalist.el \ No newline at end of file diff --git a/init/27-markdown.el b/init/48-markdown.el similarity index 100% rename from init/27-markdown.el rename to init/48-markdown.el diff --git a/init/70-kubernetes.el b/init/70-kubernetes.el new file mode 120000 index 0000000..ab1bea5 --- /dev/null +++ b/init/70-kubernetes.el @@ -0,0 +1 @@ +../conf-lisp/kubernetes.el \ No newline at end of file