summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-12-21 09:43:48 +0100
committerBastien Guerry <bzg@altern.org>2011-12-21 09:43:48 +0100
commita0f2396f8f45f489ecddae24e34bdfb46abd4c2f (patch)
treedde3879bc203577413a15bf3684108c586b0fed7
parente514982ae126c058b965dd00393b4e68e5f8522d (diff)
downloadorg-mode-a0f2396f8f45f489ecddae24e34bdfb46abd4c2f.tar.gz
Move org-eshell.el by Konrad Hinsen to Org's core.
* org-eshell.el: New file.
-rw-r--r--Makefile1
-rw-r--r--lisp/org-eshell.el (renamed from contrib/lisp/org-eshell.el)3
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index eb0a3d1..4594870 100644
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,7 @@ LISPF = org.el \
org-footnote.el \
org-freemind.el \
org-gnus.el \
+ org-eshell.el \
org-habit.el \
org-html.el \
org-icalendar.el \
diff --git a/contrib/lisp/org-eshell.el b/lisp/org-eshell.el
index c489bb8..5486b1e 100644
--- a/contrib/lisp/org-eshell.el
+++ b/lisp/org-eshell.el
@@ -4,7 +4,7 @@
;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net>
;; Version: 0.1
;;
-;; This file is not part of GNU Emacs.
+;; This file is 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
@@ -58,7 +58,6 @@
(org-store-link-props
:link (org-make-link "eshell:" link)
:description command))))
-
(provide 'org-eshell)