summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-01-04 16:10:51 +0100
committerBastien Guerry <bzg@altern.org>2011-01-04 16:10:51 +0100
commit881b73bd771b26ad8dd92baffb5b5dbe24d30631 (patch)
treeff36e5a2eafd95c35e3aeb3bd858f214f03cbd61
parent591db35943b32903ec2835fc80cc6b7dc81f362a (diff)
parent8dfd845c7f40bd01404e6e940eee56592d71bf0c (diff)
downloadorg-mode-881b73bd771b26ad8dd92baffb5b5dbe24d30631.tar.gz
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
-rw-r--r--contrib/README1
-rw-r--r--contrib/lisp/org-eshell.el65
-rw-r--r--lisp/org.el1
3 files changed, 67 insertions, 0 deletions
diff --git a/contrib/README b/contrib/README
index 6a15821..9772c50 100644
--- a/contrib/README
+++ b/contrib/README
@@ -21,6 +21,7 @@ org-depend.el --- TODO dependencies for Org-mode
org-drill.el --- Self-testing with org-learn
org-depend.el --- TODO dependencies for Org-mode
org-elisp-symbol.el --- Org links to emacs-lisp symbols
+org-eshell.el --- Support for links to working directories in eshell
org-eval.el --- The <lisp> tag, adapted from Muse
org-eval-light.el --- Evaluate in-buffer code on demand
org-exp-bibtex.el --- Export citations to LaTeX and HTML
diff --git a/contrib/lisp/org-eshell.el b/contrib/lisp/org-eshell.el
new file mode 100644
index 0000000..85b2ab9
--- /dev/null
+++ b/contrib/lisp/org-eshell.el
@@ -0,0 +1,65 @@
+;;; org-eshell.el - Support for links to working directories in eshell
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+;;
+;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net>
+;; Version: 0.1
+;;
+;; This file is not part of GNU Emacs.
+;;
+;; 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, 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; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(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)
+ (switch-to-buffer eshell-buffer-name)
+ (eshell))
+ (end-of-buffer)
+ (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
diff --git a/lisp/org.el b/lisp/org.el
index 83b0fd6..5efcc06 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -309,6 +309,7 @@ to add the symbol `xyz', and the package must have a call to
(const :tag "C collector: Collect properties into tables" org-collector)
(const :tag "C depend: TODO dependencies for Org-mode\n\t\t\t(PARTIALLY OBSOLETE, see built-in dependency support))" org-depend)
(const :tag "C elisp-symbol: Org-mode links to emacs-lisp symbols" org-elisp-symbol)
+ (const :tag "C eshell Support for links to working directories in eshell" org-eshell)
(const :tag "C eval: Include command output as text" org-eval)
(const :tag "C eval-light: Evaluate inbuffer-code on demand" org-eval-light)
(const :tag "C expiry: Expiry mechanism for Org-mode entries" org-expiry)