From fbc878cb66cbe0067998034c2d2e383b2742c0de Mon Sep 17 00:00:00 2001 From: Rob Freiburger Date: Sat, 18 Feb 2017 04:31:36 -0600 Subject: Adds option to disable auto update prompt I noticed this option was missing from the template. When I followed the directions in README to enable it, I put it below line 59 without noticing it wouldn't have any effect by then. Prevent others from making a rookie mistake like mine. --- templates/zshrc.zsh-template | 3 +++ 1 file changed, 3 insertions(+) (limited to 'templates/zshrc.zsh-template') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index af42e5b9f..93bbf36aa 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -19,6 +19,9 @@ ZSH_THEME="robbyrussell" # Uncomment the following line to disable bi-weekly auto-update checks. # DISABLE_AUTO_UPDATE="true" +# Uncomment the following line to automatically update without prompting. +# DISABLE_UPDATE_PROMPT="true" + # Uncomment the following line to change how often to auto-update (in days). # export UPDATE_ZSH_DAYS=13 -- cgit v1.2.3-70-g09d2 From 9981479900e3d3ff86bff0b3313c8e45891e880c Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Mon, 8 Apr 2019 17:34:59 +0200 Subject: zshrc: remove SSH_KEY_PATH comment Fixes #5741 --- templates/zshrc.zsh-template | 3 --- 1 file changed, 3 deletions(-) (limited to 'templates/zshrc.zsh-template') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index abd2c8812..bc892ff38 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -83,9 +83,6 @@ source $ZSH/oh-my-zsh.sh # Compilation flags # export ARCHFLAGS="-arch x86_64" -# ssh -# export SSH_KEY_PATH="~/.ssh/rsa_id" - # Set personal aliases, overriding those provided by oh-my-zsh libs, # plugins, and themes. Aliases can be placed here, though oh-my-zsh # users are encouraged to define aliases within the ZSH_CUSTOM folder. -- cgit v1.2.3-70-g09d2 From 486fa1010df847bfd8823b4492623afc7c935709 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Sat, 11 May 2019 13:42:38 +0200 Subject: lib: add ability to disable magic functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #5499 Fixes #5569 Fixes #6338 Fixes #6654 Fixes #6255 Fixes #7632 Closes #7763 Co-authored-by: Daniel Galán y Martins --- lib/misc.zsh | 6 +++--- templates/zshrc.zsh-template | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'templates/zshrc.zsh-template') diff --git a/lib/misc.zsh b/lib/misc.zsh index b30822b50..40ffa479d 100644 --- a/lib/misc.zsh +++ b/lib/misc.zsh @@ -1,7 +1,7 @@ -## Load smart urls if available -# bracketed-paste-magic is known buggy in zsh 5.1.1 (only), so skip it there; see #4434 autoload -Uz is-at-least -if [[ $ZSH_VERSION != 5.1.1 ]]; then + +# *-magic is known buggy in some versions; disable if so +if [[ $DISABLE_MAGIC_FUNCTIONS != true ]]; then for d in $fpath; do if [[ -e "$d/url-quote-magic" ]]; then if is-at-least 5.1; then diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 453daf8a2..3cc5ad46c 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -32,6 +32,9 @@ ZSH_THEME="robbyrussell" # Uncomment the following line to change how often to auto-update (in days). # export UPDATE_ZSH_DAYS=13 +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS=true + # Uncomment the following line to disable colors in ls. # DISABLE_LS_COLORS="true" -- cgit v1.2.3-70-g09d2