From e5de3051578ac4f48e50262265965bd45402e066 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Mon, 28 Jan 2013 17:08:56 -0500 Subject: [PATCH] [Fix #383] Do not set $MANPATH man dynamically searches for man pages based on $PATH. --- modules/haskell/init.zsh | 4 +--- modules/macports/init.zsh | 6 ------ modules/perl/init.zsh | 2 -- modules/python/init.zsh | 4 +--- runcoms/zshenv | 13 ------------- 5 files changed, 2 insertions(+), 27 deletions(-) diff --git a/modules/haskell/init.zsh b/modules/haskell/init.zsh index 8690ce1..c1c78ca 100644 --- a/modules/haskell/init.zsh +++ b/modules/haskell/init.zsh @@ -10,11 +10,9 @@ if (( ! $+commands[ghc] )); then return 1 fi -# Prepend Cabal per user directories to PATH/MANPATH. +# Prepend Cabal per user directories to PATH. if [[ "$OSTYPE" == darwin* && -d $HOME/Library/Haskell ]]; then path=($HOME/Library/Haskell/bin(/N) $path) - manpath=($HOME/Library/Haskell/man(/N) $manpath) else path=($HOME/.cabal/bin(/N) $path) - manpath=($HOME/.cabal/man(/N) $manpath) fi diff --git a/modules/macports/init.zsh b/modules/macports/init.zsh index 4554ca1..9183553 100644 --- a/modules/macports/init.zsh +++ b/modules/macports/init.zsh @@ -21,12 +21,6 @@ infopath=( $infopath ) -# Set the list of directories that man searches for manuals. -manpath=( - /opt/local/share/man - $manpath -) - # Set the list of directories that Zsh searches for programs. path=( /opt/local/{bin,sbin} diff --git a/modules/perl/init.zsh b/modules/perl/init.zsh index 8ba873d..0997a4b 100644 --- a/modules/perl/init.zsh +++ b/modules/perl/init.zsh @@ -20,8 +20,6 @@ if [[ "$OSTYPE" == darwin* ]]; then perl_path="$HOME/Library/Perl/5.12" if [[ -f "$perl_path/lib/perl5/local/lib.pm" ]]; then - manpath=("$perl_path/man" $manpath) - if [[ ! -s "$cache_file" ]]; then perl -I$perl_path/lib/perl5 -Mlocal::lib=$perl_path >! "$cache_file" fi diff --git a/modules/python/init.zsh b/modules/python/init.zsh index 1187561..a72f01f 100644 --- a/modules/python/init.zsh +++ b/modules/python/init.zsh @@ -17,14 +17,12 @@ if (( ! $+commands[python] && ! $+commands[pythonz] )); then fi # Prepend PEP 370 per user site packages directory, which defaults to -# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH/MANPATH. +# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH. if [[ "$OSTYPE" == darwin* ]]; then path=($HOME/Library/Python/*/bin(N) $path) - manpath=($HOME/Library/Python/*/{,share/}man(N) $manpath) else # This is subject to change. path=($HOME/.local/bin $path) - manpath=($HOME/.local/{,share/}man(N) $manpath) fi # Load virtualenvwrapper into the shell session. diff --git a/runcoms/zshenv b/runcoms/zshenv index 0adef03..7ebeb35 100644 --- a/runcoms/zshenv +++ b/runcoms/zshenv @@ -34,7 +34,6 @@ fi # typeset -gU cdpath fpath mailpath path -typeset -gxU MANPATH typeset -gxUT INFOPATH infopath # Set the the list of directories that cd searches. @@ -49,18 +48,6 @@ infopath=( $infopath ) -# Set the list of directories that man searches for manuals. -manpath=( - /usr/local/share/man - /usr/share/man - $manpath -) - -for path_file in /etc/manpaths.d/*(.N); do - manpath+=($(<$path_file)) -done -unset path_file - # Set the list of directories that Zsh searches for programs. path=( /usr/local/{bin,sbin}