aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2014-12-20 13:09:49 +0100
committerMichael Albinus2014-12-20 13:09:49 +0100
commitb459f1f0b970b640bbc1f3827115a18be2dcef7f (patch)
treeb55a886ae584f4228316b82a4b664c2719df5990
parent6623f3daaeecd1ec7cc24f3b0c534fa090b46ee1 (diff)
downloademacs-b459f1f0b970b640bbc1f3827115a18be2dcef7f.tar.gz
emacs-b459f1f0b970b640bbc1f3827115a18be2dcef7f.zip
* net/tramp-sh.el (tramp-histfile-override): Add :version.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/tramp-sh.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a76e813641..ad9548c0823 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-12-20 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-sh.el (tramp-histfile-override): Add :version.
4
12014-12-20 Teodor Zlatanov <tzz@lifelogs.com> 52014-12-20 Teodor Zlatanov <tzz@lifelogs.com>
2 6
3 * net/tramp-sh.el (tramp-histfile-override): Clarify docstring. 7 * net/tramp-sh.el (tramp-histfile-override): Clarify docstring.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e4ba762379f..ba7b7d95a4b 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -75,6 +75,7 @@ If you set this variable to nil, however, the *override* is
75disabled, so the history will go to the default storage 75disabled, so the history will go to the default storage
76location, e.g. \"$HOME/.sh_history\"." 76location, e.g. \"$HOME/.sh_history\"."
77 :group 'tramp 77 :group 'tramp
78 :version "25.1"
78 :type '(choice (const :tag "Do not override HISTFILE" nil) 79 :type '(choice (const :tag "Do not override HISTFILE" nil)
79 (const :tag "Empty the history (/dev/null)" "/dev/null") 80 (const :tag "Empty the history (/dev/null)" "/dev/null")
80 (string :tag "Redirect to a file"))) 81 (string :tag "Redirect to a file")))