forked from mirrors/org-mode
ecd0562c5f
I started from the 78ec8e commit then cherry-picked and squashed commits that have been done in master since then, except the bad commits that overwrote the tree (in master) with the tree in maint. This commit also bumps the version number to 7.8.06. The only "fix" that was made between 78ec8e and the previous commit is e0072f which has been reported to break stuff.
66 lines
2.2 KiB
EmacsLisp
66 lines
2.2 KiB
EmacsLisp
;;; org-eshell.el - Support for links to working directories in eshell
|
|
|
|
;; Copyright (C) 2011-2012 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 <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'org)
|
|
(require 'eshell)
|
|
(require 'esh-mode)
|
|
|
|
(org-add-link-type "eshell" 'org-eshell-open)
|
|
(add-hook 'org-store-link-functions 'org-eshell-store-link)
|
|
|
|
(defun org-eshell-open (link)
|
|
"Switch to am eshell buffer and execute a command line.
|
|
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)
|
|
(org-pop-to-buffer-same-window eshell-buffer-name)
|
|
(eshell))
|
|
(goto-char (point-max))
|
|
(eshell-kill-input)
|
|
(insert command)
|
|
(eshell-send-input)))
|
|
|
|
(defun org-eshell-store-link ()
|
|
"Store a link that, when opened, switches back to the current eshell buffer
|
|
and the current working directory."
|
|
(when (eq major-mode 'eshell-mode)
|
|
(let* ((command (concat "cd " dired-directory))
|
|
(link (concat (buffer-name) ":" command)))
|
|
(org-store-link-props
|
|
:link (org-make-link "eshell:" link)
|
|
:description command))))
|
|
|
|
(provide 'org-eshell)
|
|
|
|
;;; org-eshell.el ends here
|