From 47c4bce4658779066ab34920bcb3c491f8bf3d0d Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sat, 13 Jan 2018 14:54:10 +0100 Subject: [PATCH] [NSM] Sort security settings before writing to external file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should avoid updates of the private submodule just due to reordering existing entries in ‘nsm-settings-file’. --- init.el | 14 ++++++++++++-- private | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/init.el b/init.el index 715ec12..7862c49 100644 --- a/init.el +++ b/init.el @@ -694,8 +694,18 @@ _h_ _l_ _o_k _y_ank (use-package nsm :defer t - :config (setq network-security-level 'high - nsm-save-host-names t)) + :config (progn + (setq network-security-level 'high + nsm-save-host-names t) + + (defun db/sort-nsm-permanent-settings () + (setq nsm-permanent-host-settings + (cl-sort nsm-permanent-host-settings + #'string< + :key #'second))) + + (advice-add 'nsm-write-settings + :before #'db/sort-nsm-permanent-settings))) (use-package gnutls :defer t diff --git a/private b/private index 48138ee..3775c56 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 48138eed53d3f06808ae63074276a7126d55a965 +Subproject commit 3775c567d13e49ca8605126003ac8847760e19e0