diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 1 |
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 @@ | |||
| 1 | 2014-12-20 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-histfile-override): Add :version. | ||
| 4 | |||
| 1 | 2014-12-20 Teodor Zlatanov <tzz@lifelogs.com> | 5 | 2014-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 | |||
| 75 | disabled, so the history will go to the default storage | 75 | disabled, so the history will go to the default storage |
| 76 | location, e.g. \"$HOME/.sh_history\"." | 76 | location, 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"))) |