[elpa] externals/ivy dc9a36c: Merge branch 'master' into externals/ivy

[Basil L. Contovounesios]

branch: externals/ivy
commit dc9a36c3539500767e3ca1a5ddcbd6f385099c71
Merge: 1831495 c9fdec4
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    Merge branch 'master' into externals/ivy
---
 .dir-locals.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index 4e7d231..f18455c 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,8 +2,12 @@
 ;;; For more information see (info "(emacs) Directory Variables")
 
 ((nil
-  (bug-reference-bug-regexp . "#\\(?2:[[:digit:]]+\\)")
-  (bug-reference-url-format . "https://github.com/abo-abo/swiper/issues/%s";)
+  ;; Emacs 28+ automatically sets up these `bug-reference-mode' variables
+  ;; in a more general way, so setting them here is not future-proof.  If
+  ;; you still need these settings in older Emacs versions, you can add
+  ;; them to your personal `.dir-locals-2.el' file in the meantime.
+  ;; (bug-reference-bug-regexp . "\\(#\\([[:digit:]]+\\)\\)")
+  ;; (bug-reference-url-format . "https://github.com/abo-abo/swiper/issues/%s";)
   (copyright-names-regexp . "Free Software Foundation, Inc\\.")
   (sentence-end-double-space . t))
  (emacs-lisp-mode