e57787bead9d3a939f5ed9d43fab9d9e76364b99

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

Merge branch 'hotfix/remove-php-suffix-alias'

Closes #5594

Diff

 1diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
 2index 128db6e5f339f0ba932171a18d8d55bedc8a2f3c..d47b20e40c2079f9c1810dbd29fae1c7d6c138f9 100644
 3--- a/plugins/common-aliases/common-aliases.plugin.zsh
 4+++ b/plugins/common-aliases/common-aliases.plugin.zsh
 5@@ -54,17 +54,19 @@ alias mv='mv -i'
 6 # depends on the SUFFIX :)
 7 if is-at-least 4.2.0; then
 8   # open browser on urls
 9-  _browser_fts=(htm html de org net com at cx nl se dk dk php)
10-  for ft in $_browser_fts ; do alias -s $ft=$BROWSER ; done
11+  if [[ -n "$BROWSER" ]]; then
12+    _browser_fts=(htm html de org net com at cx nl se dk dk)
13+    for ft in $_browser_fts; do alias -s $ft=$BROWSER; done
14+  fi
15 
16   _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
17-  for ft in $_editor_fts ; do alias -s $ft=$EDITOR ; done
18+  for ft in $_editor_fts; do alias -s $ft=$EDITOR; done
19 
20   _image_fts=(jpg jpeg png gif mng tiff tif xpm)
21-  for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
22+  for ft in $_image_fts; do alias -s $ft=$XIVIEWER; done
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+  for ft in $_media_fts; do alias -s $ft=mplayer; done
27 
28   #read documents
29   alias -s pdf=acroread