daniel/emacs-conf
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages and add valign

Browse Source
This commit is contained in:
Daniel Weschke
2026-04-05 20:00:27 +02:00
parent b062fb98e3
commit 03fb00e374
640 changed files with 109768 additions and 39311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lisp/orgit/orgit.el
View File

@@ -1,18 +1,18 @@
;;; orgit.el --- Support for Org links to Magit buffers -*- lexical-binding:t -*-
;; Copyright (C) 2014-2025 The Magit Project Contributors
;; Copyright (C) 2014-2026 The Magit Project Contributors
;; Author: Jonas Bernoulli <emacs.orgit@jonas.bernoulli.dev>
;; Homepage: https://github.com/magit/orgit
;; Keywords: hypermedia vc
;; Package-Version: 20251123.1801
;; Package-Revision: 0444b8659620
;; Package-Version: 20260301.1255
;; Package-Revision: 4fb91faff3bf
;; Package-Requires: (
;; (emacs "28.1")
;; (compat "30.1")
;; (cond-let "0.2")
;; (magit "4.4")
;; (magit "4.5")
;; (org "9.7"))
;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -313,12 +313,12 @@ In that case `orgit-rev-store' stores one or more links instead."
(let ((repo (orgit--current-repository))
(args (if orgit-log-save-arguments
(if magit-buffer-log-files
(list magit-buffer-revisions
(list magit-buffer-log-revisions
magit-buffer-log-args
magit-buffer-log-files)
(list magit-buffer-revisions
(list magit-buffer-log-revisions
magit-buffer-log-args))
magit-buffer-revisions)))
magit-buffer-log-revisions)))
(org-link-store-props
:type "orgit-log"
:link (format "orgit-log:%s::%S" repo args)
@@ -443,32 +443,32 @@ store links to the Magit-Revision mode buffers for these commits."
(pcase-let* ((`(,dir ,rev) (split-string path "::"))
(dir (orgit--repository-directory dir)))
(cond-let*
((not (file-exists-p dir))
(signal 'org-link-broken
(list (format "Cannot determine public url for %s %s"
path "(which itself does not exist)"))))
[[default-directory dir]
[remotes (magit-git-lines "remote")]
[remote (magit-get "orgit.remote")]
[remote (cond ((length= remotes 1) (car remotes))
((member remote remotes) remote)
((member orgit-remote remotes) orgit-remote))]]
((not remote)
(signal 'org-link-broken
(list (format "Cannot determine public remote for %s"
default-directory))))
([url (magit-get "orgit" gitvar)]
(orgit--format-export (format-spec url `((?r . ,rev))) desc format))
([url (magit-get "remote" remote "url")]
[format (cl-find-if (lambda (elt)
(string-match (car elt) url))
orgit-export-alist)]
(orgit--format-export (format-spec (nth idx format)
`((?n . ,(match-string 1 url))
(?r . ,rev)))
desc format))
((signal 'org-link-broken
(list (format "Cannot determine public url for %s" path)))))))
((not (file-exists-p dir))
(signal 'org-link-broken
(list (format "Cannot determine public url for %s %s"
path "(which itself does not exist)"))))
[[default-directory dir]
[remotes (magit-git-lines "remote")]
[remote (magit-get "orgit.remote")]
[remote (cond ((length= remotes 1) (car remotes))
((member remote remotes) remote)
((member orgit-remote remotes) orgit-remote))]]
((not remote)
(signal 'org-link-broken
(list (format "Cannot determine public remote for %s"
default-directory))))
([url (magit-get "orgit" gitvar)]
(orgit--format-export (format-spec url `((?r . ,rev))) desc format))
([url (magit-get "remote" remote "url")]
[format (cl-find-if (lambda (elt)
(string-match (car elt) url))
orgit-export-alist)]
(orgit--format-export (format-spec (nth idx format)
`((?n . ,(match-string 1 url))
(?r . ,rev)))
desc format))
((signal 'org-link-broken
(list (format "Cannot determine public url for %s" path)))))))
(defun orgit--format-export (link desc format)
(pcase format
@@ -497,6 +497,9 @@ store links to the Magit-Revision mode buffers for these commits."
(provide 'orgit)
;; Local Variables:
;; indent-tabs-mode: nil
;; lisp-indent-local-overrides: (
;; (cond . 0)
;; (interactive . 0))
;; read-symbol-shorthands: (
;; ("and-let" . "cond-let--and-let")
;; ("if-let" . "cond-let--if-let")