Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[gnu-emacs] / lisp / org / org-eshell.el

diff --git a/lisp/org/org-eshell.el b/lisp/org/org-eshell.el
index 5486b1e0e9ef64bf41b6ec37e6fd6cebf15ee8d6..9c1c4a1b02d5ac37755616ff928ed01e6a44d03b 100644 (file)
--- a/lisp/org/org-eshell.el
+++ b/lisp/org/org-eshell.el
@@ -1,15 +1,15 @@
 ;;; org-eshell.el - Support for links to working directories in eshell
-;; Copyright (C) 2011 Free Software Foundation, Inc.
-;;
+
+;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+
 ;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net>
-;; Version: 0.1
-;;
+
 ;; This file is part of GNU Emacs.
-;;
-;; Emacs is free software; you can redistribute it and/or modify
+
+;; 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, or (at your option)
-;; any later version.
+;; 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
@@ -17,10 +17,11 @@
 ;; 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.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
 
 (require 'org)
 (require 'eshell)
@@ -36,18 +37,18 @@
    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 (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))
-     (end-of-buffer)
-     (eshell-kill-input)
-     (insert command)
-     (eshell-send-input)))
+    (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
@@ -56,7 +57,7 @@
     (let* ((command (concat "cd " dired-directory))
            (link  (concat (buffer-name) ":" command)))
       (org-store-link-props
-       :link (org-make-link "eshell:" link)
+       :link (concat "eshell:" link)
        :description command))))
 
 (provide 'org-eshell)