0f62b7a8d8708910e75fedb9d7b8e3d8559a34da

 1diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
 2index d47b20e40c2079f9c1810dbd29fae1c7d6c138f9..742798f27bd3f58efd8ff57bddb20b020b8b7c54 100644
 3--- a/plugins/common-aliases/common-aliases.plugin.zsh
 4+++ b/plugins/common-aliases/common-aliases.plugin.zsh
 5@@ -55,15 +55,17 @@ alias mv='mv -i'
 6 if is-at-least 4.2.0; then
 7   # open browser on urls
 8   if [[ -n "$BROWSER" ]]; then
 9-    _browser_fts=(htm html de org net com at cx nl se dk dk)
10+    _browser_fts=(htm html de org net com at cx nl se dk)
11     for ft in $_browser_fts; do alias -s $ft=$BROWSER; done
12   fi
13 
14   _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
15   for ft in $_editor_fts; do alias -s $ft=$EDITOR; done
16 
17-  _image_fts=(jpg jpeg png gif mng tiff tif xpm)
18-  for ft in $_image_fts; do alias -s $ft=$XIVIEWER; done
19+  if [[ -n "$XIVIEWER" ]]; then
20+    _image_fts=(jpg jpeg png gif mng tiff tif xpm)
21+    for ft in $_image_fts; do alias -s $ft=$XIVIEWER; done
22+  fi
23 
24   _media_fts=(ape avi flv m4a mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
25   for ft in $_media_fts; do alias -s $ft=mplayer; done
26@@ -85,4 +87,3 @@ fi
27 
28 # Make zsh know about hosts already accessed by SSH
29 zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'
30-