From b4cdcaf42ab97dce092949b4d6110f858b5ffd36 Mon Sep 17 00:00:00 2001
From: JSDurand <mmemmew@gmail.com>
Date: Mon, 18 Apr 2022 11:40:00 +0800
Subject: bookmark-conf: refine bookmark handler handling

* bookmark-conf.el: Remove bookmark(-handler)? from the name of the
  group heading.
---
 bookmark-conf.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'bookmark-conf.el')

diff --git a/bookmark-conf.el b/bookmark-conf.el
index 4e3aa5a..f2a36b2 100644
--- a/bookmark-conf.el
+++ b/bookmark-conf.el
@@ -110,8 +110,12 @@
          handler-name
          (replace-regexp-in-string
           "^durand-" ""
-          (replace-regexp-in-string
-           "-bookmark$" "" (match-string 1 handler-name))))))
+          (match-string 1 handler-name)))))
+      (setq handler-name
+            (and (stringp handler-name)
+                 (replace-regexp-in-string
+                  (rx "-bookmark" (zero-or-one "-handler") eos)
+                  "" handler-name)))
       ;; Tramp bookmarks
       (cond
        ((and (stringp location)
-- 
cgit v1.2.3-18-g5258