diff --git a/editors/diakonos/Makefile b/editors/diakonos/Makefile
index 7911a936e8f2..a65cb0fbf350 100644
--- a/editors/diakonos/Makefile
+++ b/editors/diakonos/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	diakonos
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.7
-PORTREVISION=	1
+DISTVERSION=	0.10.0
 CATEGORIES=	editors ruby
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	chris@officialunix.com
 COMMENT=	Console editor for the masses
 WWW=		https://github.com/Pistos/diakonos
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 RUN_DEPENDS=	rubygem-curses>=1.3.1:devel/rubygem-curses
 
 USES=		ruby shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	Pistos
 SHEBANG_FILES=	bin/${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	installation.rb
 SUB_LIST=	RUBY_SITELIBDIR=${RUBY_SITELIBDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}
 	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_SITELIBDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/installation.rb \
 		${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/diakonos.conf \
 		${STAGEDIR}${PREFIX}/etc/diakonos.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/diakonos-256-colour.conf \
 		${STAGEDIR}${PREFIX}/etc/diakonos-256-colour.conf.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/help
 	(cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG README.rdoc \
 		${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/help/*.dhf ${STAGEDIR}${DOCSDIR}/help
 
 .include <bsd.port.mk>
diff --git a/editors/diakonos/distinfo b/editors/diakonos/distinfo
index 8551c9166fc0..a02ad5a06507 100644
--- a/editors/diakonos/distinfo
+++ b/editors/diakonos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600936577
-SHA256 (Pistos-diakonos-v0.9.7_GH0.tar.gz) = 77b7f2d2ba29c3a72fff85c91038e19c40eef8a162945105bad203c065c554f9
-SIZE (Pistos-diakonos-v0.9.7_GH0.tar.gz) = 129807
+TIMESTAMP = 1780210869
+SHA256 (Pistos-diakonos-v0.10.0_GH0.tar.gz) = d8f477aeb6bd6e85e87f2641efc423cd1bcaf2b6b4a539f1c29c6f9b7882ca1c
+SIZE (Pistos-diakonos-v0.10.0_GH0.tar.gz) = 160758
diff --git a/editors/diakonos/pkg-plist b/editors/diakonos/pkg-plist
index f6b3dc52318c..52f7d74b2806 100644
--- a/editors/diakonos/pkg-plist
+++ b/editors/diakonos/pkg-plist
@@ -1,109 +1,114 @@
 bin/diakonos
 @sample etc/diakonos.conf.sample
 @sample etc/diakonos-256-colour.conf.sample
 %%RUBY_SITELIBDIR%%/diakonos.rb
 %%RUBY_SITELIBDIR%%/diakonos/about.rb
 %%RUBY_SITELIBDIR%%/diakonos/bookmark.rb
-%%RUBY_SITELIBDIR%%/diakonos/buffer-hash.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer-management.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/bookmarking.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/cursor.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/delete.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/display.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/file.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/indentation.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/searching.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/selection.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/undo.rb
 %%RUBY_SITELIBDIR%%/diakonos/clipboard-klipper-dbus.rb
 %%RUBY_SITELIBDIR%%/diakonos/clipboard-klipper.rb
 %%RUBY_SITELIBDIR%%/diakonos/clipboard-osx.rb
 %%RUBY_SITELIBDIR%%/diakonos/clipboard-xclip.rb
 %%RUBY_SITELIBDIR%%/diakonos/clipboard.rb
 %%RUBY_SITELIBDIR%%/diakonos/config-file.rb
 %%RUBY_SITELIBDIR%%/diakonos/config.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/enumerable.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/hash.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/object.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/regexp.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/string.rb
 %%RUBY_SITELIBDIR%%/diakonos/ctag.rb
 %%RUBY_SITELIBDIR%%/diakonos/cursor.rb
 %%RUBY_SITELIBDIR%%/diakonos/display.rb
 %%RUBY_SITELIBDIR%%/diakonos/display/format.rb
 %%RUBY_SITELIBDIR%%/diakonos/extension-set.rb
 %%RUBY_SITELIBDIR%%/diakonos/extension.rb
 %%RUBY_SITELIBDIR%%/diakonos/finding.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions-deprecated.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/basics.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/bookmarking.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/buffers.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/clipboard.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/cursor.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/grepping.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/indentation.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/readline.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/search.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/selection.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/sessions.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/shell.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/tags.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions/text-manipulation.rb
 %%RUBY_SITELIBDIR%%/diakonos/grep.rb
 %%RUBY_SITELIBDIR%%/diakonos/help.rb
 %%RUBY_SITELIBDIR%%/diakonos/hooks.rb
 %%RUBY_SITELIBDIR%%/diakonos/installation.rb
 %%RUBY_SITELIBDIR%%/diakonos/interaction-handler.rb
 %%RUBY_SITELIBDIR%%/diakonos/interaction.rb
 %%RUBY_SITELIBDIR%%/diakonos/key-map.rb
 %%RUBY_SITELIBDIR%%/diakonos/keying.rb
 %%RUBY_SITELIBDIR%%/diakonos/line-mover.rb
 %%RUBY_SITELIBDIR%%/diakonos/list.rb
 %%RUBY_SITELIBDIR%%/diakonos/logging.rb
 %%RUBY_SITELIBDIR%%/diakonos/mode.rb
 %%RUBY_SITELIBDIR%%/diakonos/mouse.rb
 %%RUBY_SITELIBDIR%%/diakonos/number-fitter.rb
 %%RUBY_SITELIBDIR%%/diakonos/range.rb
 %%RUBY_SITELIBDIR%%/diakonos/readline.rb
 %%RUBY_SITELIBDIR%%/diakonos/readline/functions.rb
 %%RUBY_SITELIBDIR%%/diakonos/search.rb
 %%RUBY_SITELIBDIR%%/diakonos/sessions.rb
 %%RUBY_SITELIBDIR%%/diakonos/sized-array.rb
 %%RUBY_SITELIBDIR%%/diakonos/text-mark.rb
 %%RUBY_SITELIBDIR%%/diakonos/vendor/fuzzy_file_finder.rb
 %%RUBY_SITELIBDIR%%/diakonos/version.rb
 %%RUBY_SITELIBDIR%%/diakonos/window.rb
+%%RUBY_SITELIBDIR%%/diakonos/functions/lsp.rb
+%%RUBY_SITELIBDIR%%/diakonos/lsp.rb
+%%RUBY_SITELIBDIR%%/diakonos/lsp/diagnostic.rb
+%%RUBY_SITELIBDIR%%/diakonos/lsp/server.rb
+%%RUBY_SITELIBDIR%%/diakonos/lsp/session.rb
+%%RUBY_SITELIBDIR%%/diakonos/lsp/transport.rb
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/README.rdoc
 %%PORTDOCS%%%%DOCSDIR%%/help/about-help.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/clipboard.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/close-file.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/code-block-navigation.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/column-markers.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/config.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/cursor-stack.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/delete.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/extensions.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/file-type.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/key-mapping.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/line-numbers.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/macros.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/new-file.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/open-file.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/quit.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/resizing.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/ruby.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/save-file.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/scripting.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/search.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/shell.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/speed.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/support.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/switch-buffers.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/tabs.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/undo.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/uninstall.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/welcome.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/word-wrap.dhf