Merge upstream/master

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

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

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
 -------