aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorGlenn Morris2019-03-01 09:40:22 -0800
committerGlenn Morris2019-03-01 09:40:22 -0800
commit3c1407cedf9787605cf6c8ea6071bc97acb169b4 (patch)
tree4718edd369ef5f4cf5f0c8c6ab6e8a67b8d862ec /doc/misc
parent7e29eae023c8158d41eba02c2367e70cbee53642 (diff)
parentdee3cdc50415a3fa45c6b043590d99adf47c7c69 (diff)
downloademacs-3c1407cedf9787605cf6c8ea6071bc97acb169b4.tar.gz
emacs-3c1407cedf9787605cf6c8ea6071bc97acb169b4.zip
Merge from origin/emacs-26
dee3cdc Minor improvement for docs of completion c86d419 ; * src/image.c (imagemagick_load, svg_load): Fix typos in co... 6d46fa9 Disable the timerfd interface on Cygwin 3707ea4 Fix a typo in the doc string of 'regex-opt' d9905d5 Document bash 5.0.0 misbehavior in tramp.texi (Bug#34192) # Conflicts: # doc/misc/tramp.texi
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/tramp.texi4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 3630c317b2f..db3b3f7fee5 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3857,7 +3857,9 @@ Due to the remote shell saving tilde expansions triggered by
3857@value{tramp} can suppress this behavior with the user option 3857@value{tramp} can suppress this behavior with the user option
3858@code{tramp-histfile-override}. When set to @code{t}, environment 3858@code{tramp-histfile-override}. When set to @code{t}, environment
3859variable @env{HISTFILE} is unset, and environment variables 3859variable @env{HISTFILE} is unset, and environment variables
3860@env{HISTFILESIZE} and @env{HISTSIZE} are set to 0. 3860@env{HISTFILESIZE} and @env{HISTSIZE} are set to 0. Don't use this
3861with @command{bash} 5.0.0. There is a bug in @command{bash} which
3862lets @command{bash} die.
3861 3863
3862Alternatively, @code{tramp-histfile-override} could be a string. 3864Alternatively, @code{tramp-histfile-override} could be a string.
3863Environment variable @env{HISTFILE} is set to this file name then. Be 3865Environment variable @env{HISTFILE} is set to this file name then. Be