From: NeilBrown Date: Fri, 25 Aug 2023 00:30:15 +0000 (+1000) Subject: Move config file into new 'data' directory. X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=e81cb8c80c8785e3537e10bb32d2ce85f087f68c;p=edlib.git Move config file into new 'data' directory. Also make lib/edlib point to data, not just to '..'. This will allow the image files to be found with xdg-find-edlib-file/data. Signed-off-by: NeilBrown --- diff --git a/Makefile b/Makefile index 01ac19b2..0f1205b2 100644 --- a/Makefile +++ b/Makefile @@ -204,7 +204,7 @@ O/.exists: lib/.exists: @mkdir -p lib @ln -s ../python lib/python - @ln -s .. lib/edlib + @ln -s ../data lib/edlib @touch $@ .PHONY: lib bin @@ -258,5 +258,5 @@ checksym: edlib .PHONY: clean clean: - rm -f edlib edlib-static + rm -f edlib edlib-static rexel rm -rf lib O bin diff --git a/data/edlib.ini b/data/edlib.ini new file mode 100644 index 00000000..449612cd --- /dev/null +++ b/data/edlib.ini @@ -0,0 +1,33 @@ +[include] +include = modules.ini + +[global] + +editor-initial-panes = input DISPLAY + " x11selection messageline" + " global-keymap mode-emacs tile" +[file:COMMIT_EDITMSG*] +APPEND view-default = ,textfill,whitespace,autospell +fill-width = 72 + +[file:.stgit] +APPEND view-default = ,textfill,whitespace,autospell +fill-width = 72 + +[file:*.md] + +TESTING APPEND view-default = ,textfill,whitespace +NOTESTING APPEND view-default = ,textfill,whitespace,autospell + +fill-width = 72 +word-wrap = 1 +fill:start-re = "^(" + "[^a-zA-Z0-9\\n]*$|" # empty/puctuation line + " *-|" # list item + " *- *\\[[ X]]|" # todo list item + " *#+|" # section head + " *[0-9]*\\.)" # Numbered list + +[include] + +include = config.ini diff --git a/data/modules.ini b/data/modules.ini new file mode 100644 index 00000000..ec3b800a --- /dev/null +++ b/data/modules.ini @@ -0,0 +1,163 @@ +# One day this will be automatically generated from all +# modules found in the module path +[module] + +lang-python = global-load-modules:python + +lib-popup = PopupTile +lib-linecount = + Countlines + CountLinesAsync + attach-line-count +lib-search = + text-search + text-match + make-search + text-equals +doc-text = + attach-doc-text + open-doc-text +doc-dir = + attach-doc-dir + open-doc-dir +doc-email = + open-doc-email + attach-email-view + +display-x11-xcb = + interactive-cmd-x11window + attach-display-x11 +display-pygtk = + interactive-cmd-gtkwindow + attach-display-gtk + +render-hex = + attach-render-hex + doc:appeared-hex +render-present = + attach-markdown-present + attach-present + doc:appeared-present +render-lines = + attach-render-lines + attach-render-text +render-format = attach-render-format +render-c-mode = + doc:appeared-c-mode + doc:appeared-py-mode + interactive-cmd-indent + +lib-viewer = + attach-viewer + doc:appeared-viewer +lib-qprint = + attach-quoted_printable + attach-qprint +lib-copybuf = + copy:save + copy:get +lib-colourmap = colour:map +lib-textfill = + attach-textfill + interactive-cmd-fill-mode +lib-autosave = + startup-autosave + interactice-cmd-recover + doc:appeared-check-autosave +lib-make = + interactive-cmd-make + interactive-cmd-grep + interactive-cmd-git-grep + interactive-cmd-next-match +lib-server = + startup-server + interactive-cmd-server-start +lib-macro = macro:capture +lib-aspell = + Spell:Check + Spell:Suggest + Spell:ThisWord + Spell:NextWord +lib-calc = + CalcExpr + interactive-cmd-calc-replace +render-calc = + interactive-cmd-calc + doc:appeared-calc +lib-mergeview = + interactice-cmd-merge-mode + doc:appeared-mergeview +lib-compose-email = attach-compose-email +lib-autospell = + interactive-cmd-autospell + attach-autospell +lib-whitespace = + attach-whitespace + interactice-cmd-whitespace-mode +lib-x11selection-xcb = attach-x11selection +lib-url = + url:mark-up + attach-render-url-view +lib-diff = + attach-diff + interactive-cmd-diff-mode +lib-wiggle = MakeWiggle + +module-notmuch = + interactive-cmd-nm + interactive-cmd-nmc + interactive-cmd-nms + +emacs-search = + attach-emacs-search + attach-emacs-search-highlight + +lib-html-to-text = html-to-text +lib-html-w3m = html-to-text-w3m +lib-pdf-to-text = pdf-to-text +lib-doc-to-text = doc-to-text +lib-ical-to-text = ical-to-text +lib-utf8 = + attach-charset-utf-8 + attach-utf8 +lib-charset = + PREFIX attach-charset-windows- + PREFIX attach-charset-iso-8859- + attach-charset-us-ascii + PREFIX charset-to-utf8-windows- + PREFIX charset-to-utf8-iso-8859- + + +doc-docs = attach-doc-docs +doc-list = attach-doc-list +doc-multipart = attach-doc-multipart +render-complete = attach-render-complete +mode-emacs = attach-mode-emacs +display-ncurses = attach-display-ncurses +lib-abbrev = attach-abbrev +lib-base64 = attach-base64 +lib-crop = attach-crop +lib-history = attach-history +lib-input = attach-input +lib-keymap = attach-keymap +lib-libevent = attach-libevent +lib-linefilter = attach-linefilter +lib-markup = attach-markup +lib-menu = attach-menu +lib-messageline = attach-messageline +lib-renderline = attach-renderline +lib-rfc822header = attach-rfc822header +lib-tile = attach-tile +lib-view = attach-view +lib-keymap = attach-global-keymap +lib-glibevents = attach-glibevents +lib-shellcmd = attach-shellcmd + +lib-unicode-names = Unicode-names +lib-menu = attach-menu +lib-askpass = AskPass + +lib-test-markup = + attach-test-markup + interactive-cmd-test-markup + diff --git a/edlib.ini b/edlib.ini deleted file mode 100644 index 449612cd..00000000 --- a/edlib.ini +++ /dev/null @@ -1,33 +0,0 @@ -[include] -include = modules.ini - -[global] - -editor-initial-panes = input DISPLAY - " x11selection messageline" - " global-keymap mode-emacs tile" -[file:COMMIT_EDITMSG*] -APPEND view-default = ,textfill,whitespace,autospell -fill-width = 72 - -[file:.stgit] -APPEND view-default = ,textfill,whitespace,autospell -fill-width = 72 - -[file:*.md] - -TESTING APPEND view-default = ,textfill,whitespace -NOTESTING APPEND view-default = ,textfill,whitespace,autospell - -fill-width = 72 -word-wrap = 1 -fill:start-re = "^(" - "[^a-zA-Z0-9\\n]*$|" # empty/puctuation line - " *-|" # list item - " *- *\\[[ X]]|" # todo list item - " *#+|" # section head - " *[0-9]*\\.)" # Numbered list - -[include] - -include = config.ini diff --git a/modules.ini b/modules.ini deleted file mode 100644 index ec3b800a..00000000 --- a/modules.ini +++ /dev/null @@ -1,163 +0,0 @@ -# One day this will be automatically generated from all -# modules found in the module path -[module] - -lang-python = global-load-modules:python - -lib-popup = PopupTile -lib-linecount = - Countlines - CountLinesAsync - attach-line-count -lib-search = - text-search - text-match - make-search - text-equals -doc-text = - attach-doc-text - open-doc-text -doc-dir = - attach-doc-dir - open-doc-dir -doc-email = - open-doc-email - attach-email-view - -display-x11-xcb = - interactive-cmd-x11window - attach-display-x11 -display-pygtk = - interactive-cmd-gtkwindow - attach-display-gtk - -render-hex = - attach-render-hex - doc:appeared-hex -render-present = - attach-markdown-present - attach-present - doc:appeared-present -render-lines = - attach-render-lines - attach-render-text -render-format = attach-render-format -render-c-mode = - doc:appeared-c-mode - doc:appeared-py-mode - interactive-cmd-indent - -lib-viewer = - attach-viewer - doc:appeared-viewer -lib-qprint = - attach-quoted_printable - attach-qprint -lib-copybuf = - copy:save - copy:get -lib-colourmap = colour:map -lib-textfill = - attach-textfill - interactive-cmd-fill-mode -lib-autosave = - startup-autosave - interactice-cmd-recover - doc:appeared-check-autosave -lib-make = - interactive-cmd-make - interactive-cmd-grep - interactive-cmd-git-grep - interactive-cmd-next-match -lib-server = - startup-server - interactive-cmd-server-start -lib-macro = macro:capture -lib-aspell = - Spell:Check - Spell:Suggest - Spell:ThisWord - Spell:NextWord -lib-calc = - CalcExpr - interactive-cmd-calc-replace -render-calc = - interactive-cmd-calc - doc:appeared-calc -lib-mergeview = - interactice-cmd-merge-mode - doc:appeared-mergeview -lib-compose-email = attach-compose-email -lib-autospell = - interactive-cmd-autospell - attach-autospell -lib-whitespace = - attach-whitespace - interactice-cmd-whitespace-mode -lib-x11selection-xcb = attach-x11selection -lib-url = - url:mark-up - attach-render-url-view -lib-diff = - attach-diff - interactive-cmd-diff-mode -lib-wiggle = MakeWiggle - -module-notmuch = - interactive-cmd-nm - interactive-cmd-nmc - interactive-cmd-nms - -emacs-search = - attach-emacs-search - attach-emacs-search-highlight - -lib-html-to-text = html-to-text -lib-html-w3m = html-to-text-w3m -lib-pdf-to-text = pdf-to-text -lib-doc-to-text = doc-to-text -lib-ical-to-text = ical-to-text -lib-utf8 = - attach-charset-utf-8 - attach-utf8 -lib-charset = - PREFIX attach-charset-windows- - PREFIX attach-charset-iso-8859- - attach-charset-us-ascii - PREFIX charset-to-utf8-windows- - PREFIX charset-to-utf8-iso-8859- - - -doc-docs = attach-doc-docs -doc-list = attach-doc-list -doc-multipart = attach-doc-multipart -render-complete = attach-render-complete -mode-emacs = attach-mode-emacs -display-ncurses = attach-display-ncurses -lib-abbrev = attach-abbrev -lib-base64 = attach-base64 -lib-crop = attach-crop -lib-history = attach-history -lib-input = attach-input -lib-keymap = attach-keymap -lib-libevent = attach-libevent -lib-linefilter = attach-linefilter -lib-markup = attach-markup -lib-menu = attach-menu -lib-messageline = attach-messageline -lib-renderline = attach-renderline -lib-rfc822header = attach-rfc822header -lib-tile = attach-tile -lib-view = attach-view -lib-keymap = attach-global-keymap -lib-glibevents = attach-glibevents -lib-shellcmd = attach-shellcmd - -lib-unicode-names = Unicode-names -lib-menu = attach-menu -lib-askpass = AskPass - -lib-test-markup = - attach-test-markup - interactive-cmd-test-markup -