mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-07-18 02:46:26 +00:00
95554543b9
* lisp/ol.el (org-store-link): Refactor org-id links to use standard `org-store-link-functions'. (org-link-search): Create new headings at appropriate level. (org-link-precise-link-target): New function extracting logic to identify a precise link target, e.g. a heading, named object, or text search. (org-link-try-link-store-functions): Extract logic to call external link store functions. Pass them a new `interactive?' argument. * lisp/ol-bbdb.el (org-bbdb-store-link): * lisp/ol-bibtex.el (org-bibtex-store-link): * lisp/ol-docview.el (org-docview-store-link): * lisp/ol-eshell.el (org-eshell-store-link): * lisp/ol-eww.el (org-eww-store-link): * lisp/ol-gnus.el (org-gnus-store-link): * lisp/ol-info.el (org-info-store-link): * lisp/ol-irc.el (org-irc-store-link): * lisp/ol-man.el (org-man-store-link): * lisp/ol-mhe.el (org-mhe-store-link): * lisp/ol-rmail.el (org-rmail-store-link): Accept optional arg. * lisp/org-id.el (org-id-link-consider-parent-id): New option to allow a parent heading with an id to be considered as a link target. (org-id-link-use-context): New option to add context to org-id links. (org-id-get): Add optional `inherit' argument which considers parents' IDs if the current entry does not have one. (org-id-store-link): Consider IDs of parent headings as link targets when current heading has no ID and `org-id-link-consider-parent-id' is set. Add a search string to the link when enabled. (org-id-store-link-maybe): Function set as :store option for custom id link property. Move logic from `org-store-link' here to determine when an org-id link should be stored using `org-id-store-link'. (org-id-open): Recognise search strings after "::" in org-id links. * lisp/org-lint.el: Add checker for "::" in ID properties. * testing/lisp/test-ol.el: Add tests for `org-link-precise-link-target' and `org-id-store-link' functions, testing new options. * doc/org-manual.org: Update documentation about links. * etc/ORG-NEWS: Document changes and new options. These feature allows for more precise links when using org-id to link to org headings, without requiring every single headline to have an id. Link: https://list.orgmode.org/118435e8-0b20-46fd-af6a-88de8e19fac6@app.fastmail.com/
77 lines
2.5 KiB
EmacsLisp
77 lines
2.5 KiB
EmacsLisp
;;; ol-eshell.el --- Links to Working Directories in Eshell -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2011-2024 Free Software Foundation, Inc.
|
|
|
|
;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs 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 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'org-macs)
|
|
(org-assert-version)
|
|
|
|
(require 'eshell)
|
|
(require 'esh-mode)
|
|
(require 'ol)
|
|
|
|
(declare-function eshell/pwd "em-dirs.el" (&rest args))
|
|
|
|
(org-link-set-parameters "eshell"
|
|
:follow #'org-eshell-open
|
|
:store #'org-eshell-store-link)
|
|
|
|
(defun org-eshell-open (link _)
|
|
"Switch to an eshell buffer and execute a command line for LINK.
|
|
The LINK can be just a command line (executed in the default
|
|
eshell buffer) or a command line prefixed by a buffer name
|
|
followed by a colon."
|
|
(let* ((buffer-and-command
|
|
(if (string-match "\\([A-Za-z0-9+*-]+\\):\\(.*\\)" link)
|
|
(list (match-string 1 link)
|
|
(match-string 2 link))
|
|
(list eshell-buffer-name link)))
|
|
(eshell-buffer-name (car buffer-and-command))
|
|
(command (cadr buffer-and-command)))
|
|
(if (get-buffer eshell-buffer-name)
|
|
(pop-to-buffer
|
|
eshell-buffer-name
|
|
(if (boundp 'display-comint-buffer-action) ; Emacs >= 29
|
|
display-comint-buffer-action
|
|
'(display-buffer-same-window (inhibit-same-window))))
|
|
(eshell))
|
|
(goto-char (point-max))
|
|
(eshell-kill-input)
|
|
(insert command)
|
|
(eshell-send-input)))
|
|
|
|
(defun org-eshell-store-link (&optional _interactive?)
|
|
"Store eshell link.
|
|
When opened, the link switches back to the current eshell buffer and
|
|
the current working directory."
|
|
(when (eq major-mode 'eshell-mode)
|
|
(let* ((command (concat "cd " (eshell/pwd)))
|
|
(link (concat (buffer-name) ":" command)))
|
|
(org-link-store-props
|
|
:link (concat "eshell:" link)
|
|
:description command))))
|
|
|
|
(provide 'ol-eshell)
|
|
|
|
;;; ol-eshell.el ends here
|