pkg update and first config fix

org-brain not working, add org-roam

lisp/magit/magit-notes.el

@@ -1,19 +1,16 @@
-;;; magit-notes.el --- notes support  -*- lexical-binding: t -*-
+;;; magit-notes.el --- Notes support  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2010-2022  The Magit Project Contributors
-;;
-;; You should have received a copy of the AUTHORS.md file which
-;; lists all contributors.  If not, see http://magit.vc/authors.
+;; Copyright (C) 2008-2022 The Magit Project Contributors
 
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
-;; Magit is free software; you can redistribute it and/or modify it
+;; Magit is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 ;;
 ;; Magit is distributed in the hope that it will be useful, but WITHOUT
 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -21,7 +18,7 @@
 ;; License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see http://www.gnu.org/licenses.
+;; along with Magit.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -71,27 +68,29 @@
 (transient-define-infix magit-core.notesRef ()
   :class 'magit--git-variable
   :variable "core.notesRef"
-  :reader 'magit-notes-read-ref
+  :reader #'magit-notes-read-ref
   :prompt "Set local core.notesRef")
 
 (transient-define-infix magit-notes.displayRef ()
   :class 'magit--git-variable
   :variable "notes.displayRef"
   :multi-value t
-  :reader 'magit-notes-read-refs
+  :reader #'magit-notes-read-refs
   :prompt "Set local notes.displayRef")
 
 (transient-define-infix magit-global-core.notesRef ()
   :class 'magit--git-variable
   :variable "core.notesRef"
-  :reader 'magit-notes-read-ref
+  :global t
+  :reader #'magit-notes-read-ref
   :prompt "Set global core.notesRef")
 
 (transient-define-infix magit-global-notes.displayRef ()
   :class 'magit--git-variable
   :variable "notes.displayRef"
+  :global t
   :multi-value t
-  :reader 'magit-notes-read-refs
+  :reader #'magit-notes-read-refs
   :prompt "Set global notes.displayRef")
 
 (transient-define-argument magit-notes:--ref ()
@@ -99,7 +98,7 @@
   :class 'transient-option
   :key "-r"
   :argument "--ref="
-  :reader 'magit-notes-read-ref)
+  :reader #'magit-notes-read-ref)
 
 (transient-define-argument magit-notes:--strategy ()
   :description "Merge strategy"
@@ -165,16 +164,16 @@ Also see `magit-notes-merge'."
 ;;; Readers
 
 (defun magit-notes-read-ref (prompt _initial-input history)
-  (--when-let (magit-completing-read
-               prompt (magit-list-notes-refnames) nil nil
-               (--when-let (magit-get "core.notesRef")
-                 (if (string-prefix-p "refs/notes/" it)
-                     (substring it 11)
-                   it))
-               history)
-    (if (string-prefix-p "refs/" it)
-        it
-      (concat "refs/notes/" it))))
+  (and-let* ((ref (magit-completing-read
+                   prompt (magit-list-notes-refnames) nil nil
+                   (and-let* ((def (magit-get "core.notesRef")))
+                     (if (string-prefix-p "refs/notes/" def)
+                         (substring def 11)
+                       def))
+                   history)))
+    (if (string-prefix-p "refs/" ref)
+        ref
+      (concat "refs/notes/" ref))))
 
 (defun magit-notes-read-refs (prompt &optional _initial-input _history)
   (mapcar (lambda (ref)
@@ -193,9 +192,9 @@ Also see `magit-notes-merge'."
 
 (defun magit-notes-read-args (prompt)
   (list (magit-read-branch-or-commit prompt (magit-stash-at-point))
-        (--when-let (--first (string-match "^--ref=\\(.+\\)" it)
-                             (transient-args 'magit-notes))
-          (match-string 1 it))))
+        (and-let* ((str (--first (string-match "^--ref=\\(.+\\)" it)
+                                 (transient-args 'magit-notes))))
+          (match-string 1 str))))
 
 ;;; _
 (provide 'magit-notes)