From 954ca0f017f62f52ee679f2aa68effb20c917278 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 2 Feb 2015 16:42:01 +0100 Subject: [PATCH] * net/tramp-sh.el (tramp-histfile-override): Use `unset' as default. --- lisp/ChangeLog | 3 ++- lisp/net/tramp-sh.el | 15 +++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 382b6537af6..6e5b078f94d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -8,7 +8,8 @@ 2015-02-02 Michael Albinus - * net/tramp-sh.el (tramp-histfile-override): Add another choice 'unset. + * net/tramp-sh.el (tramp-histfile-override): Add another choice + 'unset. Use it as default. (tramp-open-shell, tramp-maybe-open-connection): Support it. (Bug#19731) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index ae0dad715bf..20e32e9df6b 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -65,13 +65,13 @@ files conditionalize this setup based on the TERM environment variable." :type 'string) ;;;###tramp-autoload -(defcustom tramp-histfile-override "/dev/null" +(defcustom tramp-histfile-override 'unset "When invoking a shell, override the HISTFILE with this value. -By default, the HISTFILE is set to the \"/dev/null\" value, which -is special on Unix systems and indicates the shell history should -not be logged (this avoids clutter due to Tramp commands). - -The symbol `unset' removes any setting of HISTFILE. +By default, it is set to the symbol `unset', which unsets any +setting of HISTFILE. When setting to a string, it redirects the +shell history to that file. Be careful when setting to +\"/dev/null\"; this might result in undesired results when using +\"bash\" as shell. If you set this variable to nil, however, the *override* is disabled, so the history will go to the default storage @@ -79,8 +79,7 @@ location, e.g. \"$HOME/.sh_history\"." :group 'tramp :version "25.1" :type '(choice (const :tag "Do not override HISTFILE" nil) - (const :tag "Unset HISTFILE" 'unset) - (const :tag "Empty the history (/dev/null)" "/dev/null") + (const :tag "Unset HISTFILE" unset) (string :tag "Redirect to a file"))) ;;;###tramp-autoload -- 2.11.4.GIT