From 4a32e9d68b95ed3b6554d662fc774c5f5efb391d Mon Sep 17 00:00:00 2001 From: Jongwook Choi Date: Mon, 20 Jan 2020 07:25:07 -0800 Subject: [PATCH 1/3] node: suppress node-info when nvm points system-wide node (#802) On modern versions of nvm, when virtual environment is not activated (i.e. node comes from system-wide and `nvm version` == 'system'), redundant node-info could be suppressed from showing. From 7cad349a5aac43d4a7779e9d51bab43007af5902 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Mon, 20 Jan 2020 16:29:34 +0100 Subject: [PATCH 2/3] environment: improve the TTY check (#1785) Bug report from @qosmio: https://github.com/sorin-ionescu/prezto/pull/1771#issuecomment-575596417 I'm unable to reproduce it and @qosmio hasn't yet confirmed or disconfirmed whether this fix works. It's a good idea to change the code this way in either case. (As I mentioned in #1771, this `stty -ixon` call may have been added by mistake. It doesn't do what the comment suggest and is at least as likely to be harming users as helping them.) --- modules/environment/init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/environment/init.zsh b/modules/environment/init.zsh index ac76278..836a6cd 100644 --- a/modules/environment/init.zsh +++ b/modules/environment/init.zsh @@ -39,7 +39,7 @@ setopt RC_QUOTES # Allow 'Henry''s Garage' instead of 'Henry'\''s Gar unsetopt MAIL_WARNING # Don't print a warning message if a mail file has been accessed. # Allow mapping Ctrl+S and Ctrl+Q shortcuts -[[ -n ${TTY:-} && $+commands[stty] == 1 ]] && stty -ixon <$TTY >$TTY +[[ -r ${TTY:-} && -w ${TTY:-} && $+commands[stty] == 1 ]] && stty -ixon <$TTY >$TTY # # Jobs From 66b9ea7d44740be0d8185b4623398f27fed8104d Mon Sep 17 00:00:00 2001 From: Kaleb Elwert Date: Mon, 20 Jan 2020 07:50:42 -0800 Subject: [PATCH 3/3] Update documentation - Fix an old link to the wrong issue tracker - Add documentation to the history module about migration from oh-my-zsh Closes #1766 --- modules/editor/README.md | 2 +- modules/history/README.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/editor/README.md b/modules/editor/README.md index d5280c4..7035635 100644 --- a/modules/editor/README.md +++ b/modules/editor/README.md @@ -106,4 +106,4 @@ Authors - [Sorin Ionescu](https://github.com/sorin-ionescu) -[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues +[1]: https://github.com/sorin-ionescu/prezto/issues diff --git a/modules/history/README.md b/modules/history/README.md index a5a4acb..1a03bd9 100644 --- a/modules/history/README.md +++ b/modules/history/README.md @@ -3,6 +3,10 @@ History Sets [history][1] options and defines history aliases. +**Note:** If you are migrating from oh-my-zsh and want to keep your history, you +will either need to set HISTFILE manually to `$HOME/.zsh_history` or rename +`~/.zsh_history` to ~/.zhistory`. + Options -------