Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

* upstream/master: (52 commits)
  Rename archive module functions
  [Fix #436] Update link to Bombich rsync
  Revert "[Fix #436] Remove Bombich rsync references"
  [Fix #436] Remove Bombich rsync references
  Add the RubyGems bin directory to PATH on other Unix systems
  Do not substitute /tmp since $TMPDIR is always set
  [Fix #437] Always set $TMPDIR
  Make gpg-agent and ssh-agent work with each other
  [Fix #425] Rewrite module ssh-agent; rename it to ssh
  [Fix #103] Add documentation for editor
  Remove the git-info SIGINT message
  [Fix #307] Do not auto-off git-info
  Remove ununsed variable
  Clarify Git listing aliases descriptions
  Swap aliases gsd and gsL
  Rename alias gRc to gRp
  [Fix #221] Add a simple git-info
  [#221] Do not format undefined zstyles
  Initialize ahead and behind local variables
  Add rar command to archive module
  ...

Conflicts:
	runcoms/zpreztorc
  • Loading branch information...
2 parents ba8cad8 + 16aa48b commit c0f412745b749077ff1ca283320032f0e56fc24c @agrimaldi committed Jul 11, 2013
Showing with 702 additions and 543 deletions.
  1. +0 −19 README.md
  2. +3 −3 modules/README.md
  3. +4 −4 modules/archive/README.md
  4. +2 −2 modules/archive/functions/{_ls-archive → _lsarchive}
  5. +2 −2 modules/archive/functions/{_extract → _unarchive}
  6. +4 −2 modules/archive/functions/{ls-archive → lsarchive}
  7. +4 −2 modules/archive/functions/{extract → unarchive}
  8. +0 −3 modules/completion/init.zsh
  9. +63 −0 modules/editor/README.md
  10. +6 −40 modules/editor/init.zsh
  11. +33 −0 modules/emacs/README.md
  12. +25 −0 modules/emacs/init.zsh
  13. +2 −0 modules/environment/init.zsh
  14. +45 −26 modules/git/README.md
  15. +12 −12 modules/git/alias.zsh
  16. +176 −123 modules/git/functions/git-info
  17. +0 −25 modules/gpg-agent/README.md
  18. +0 −44 modules/gpg-agent/init.zsh
  19. +27 −0 modules/gpg/README.md
  20. +44 −0 modules/gpg/init.zsh
  21. +1 −3 modules/haskell/init.zsh
  22. +1 −9 modules/helper/functions/add-zsh-trap
  23. +12 −0 modules/history-substring-search/README.md
  24. +15 −3 modules/history-substring-search/init.zsh
  25. +0 −12 modules/macports/init.zsh
  26. +24 −1 modules/node/README.md
  27. +25 −0 modules/node/functions/node-info
  28. +7 −1 modules/node/init.zsh
  29. +0 −1 modules/osx/README.md
  30. +0 −27 modules/osx/functions/trash
  31. +1 −1 modules/pacman/functions/pacman-list-disowned
  32. +0 −2 modules/perl/init.zsh
  33. +1 −1 modules/prompt/README.md
  34. +4 −0 modules/prompt/functions/prompt_sorin_setup
  35. +1 −3 modules/python/init.zsh
  36. +1 −1 modules/rsync/README.md
  37. +1 −1 modules/rsync/init.zsh
  38. +2 −1 modules/ruby/init.zsh
  39. +0 −36 modules/ssh-agent/README.md
  40. +0 −62 modules/ssh-agent/init.zsh
  41. +28 −0 modules/ssh/README.md
  42. +48 −0 modules/ssh/init.zsh
  43. +12 −0 modules/syntax-highlighting/README.md
  44. +10 −2 modules/syntax-highlighting/init.zsh
  45. +3 −0 modules/tmux/init.zsh
  46. +1 −1 runcoms/README.md
  47. +30 −21 runcoms/zpreztorc
  48. +22 −47 runcoms/zshenv
View
@@ -33,25 +33,6 @@ version is 4.3.10.
5. Open a new Zsh terminal window or tab.
-### Mac OS X
-
-If you have administrator privileges, you must fix an Apple-introduced problem
-in Mac OS X 10.5 Leopard by executing the following command, or BASH and Zsh
-will have the wrong `PATH` when executed non-interactively.
-
- sudo chmod ugo-x /usr/libexec/path_helper
-
-`path_helper` is intended to make it easier for installers to add new paths to
-the environment without having to edit shell configuration files by adding
-a file with a path to the */etc/paths.d* directory.
-
-Unfortunately, `path_helper` always reads paths from */etc/paths* set by Apple
-then paths from */etc/paths.d* set by third party installers, and lastly paths
-from the `PATH` environment variable set by the parent process, which
-ultimately is set by the user with `export PATH=...` Thus, it reorders path
-priorities, and user */bin* directories meant to override system */bin*
-directories end up at the tail of the array.
-
### Troubleshooting
If you are not able to find certain commands after switching to *Prezto*,
View
@@ -8,7 +8,7 @@ Load modules in *zpreztorc*. The order matters.
Archive
-------
-Provides functions to extract and list popular archive formats.
+Provides functions to list and extract archives.
Command-Not-Found
-----------------
@@ -46,10 +46,10 @@ GNU Utility
Provides for the interactive use of GNU utilities on non-GNU systems.
-GPG-Agent
+GPG
---------
-Provides for an easier use of gpg-agent.
+Provides for an easier use of GPG by setting up gpg-agent.
Haskell
-------
@@ -1,13 +1,13 @@
Archive
=======
-Provides functions to extract and list popular archive formats.
+Provides functions to list and extract archives.
Functions
---------
- - `extract` extracts the contents of one or more archives.
- - `ls-archive` lists the contents of one or more archives.
+ - `lsarchive` lists the contents of one or more archives.
+ - `unarchive` extracts the contents of one or more archives.
Supported Formats
-----------------
@@ -26,7 +26,7 @@ installed:
- *.lzma* requires `unlzma`.
- *.Z* requires `uncompress`.
- *.zip* requires `unzip`.
- - *.rar* requires `unrar`.
+ - *.rar* requires `unrar` or `rar`.
- *.7z* requires `7za`.
- *.deb* requires `ar`, `tar`.
@@ -1,8 +1,8 @@
-#compdef ls-archive
+#compdef lsarchive
#autoload
#
-# Completes ls-archive.
+# Completes lsarchive.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
@@ -1,8 +1,8 @@
-#compdef extract
+#compdef unarchive
#autoload
#
-# Completes extract.
+# Completes unarchive.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
@@ -1,5 +1,5 @@
#
-# Lists the contents of popular archive formats.
+# Lists the contents of archives.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
@@ -41,7 +41,9 @@ while (( $# > 0 )); do
|| lzcat "$1" | tar x${verbose:+v}f - ;;
(*.tar) tar t${verbose:+v}f "$1" ;;
(*.zip) unzip -l${verbose:+v} "$1" ;;
- (*.rar) unrar ${${verbose:+v}:-l} "$1" ;;
+ (*.rar) unrar &> /dev/null \
+ && unrar ${${verbose:+v}:-l} "$1" \
+ || rar ${${verbose:+v}:-l} "$1" ;;
(*.7z) 7za l "$1" ;;
(*)
print "$0: cannot list: $1" >&2
@@ -1,5 +1,5 @@
#
-# Extracts the contents of popular archive formats.
+# Extracts the contents of archives.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
@@ -53,7 +53,9 @@ while (( $# > 0 )); do
(*.lzma) unlzma "$1" ;;
(*.Z) uncompress "$1" ;;
(*.zip) unzip "$1" -d $extract_dir ;;
- (*.rar) unrar e -ad "$1" ;;
+ (*.rar) unrar &> /dev/null \
+ && unrar e -ad "$1" \
+ || rar e -ad "$1" ;;
(*.7z) 7za x "$1" ;;
(*.deb)
mkdir -p "$extract_dir/control"
@@ -30,9 +30,6 @@ setopt AUTO_PARAM_SLASH # If completed parameter is a directory, add a traili
unsetopt MENU_COMPLETE # Do not autoselect the first completion entry.
unsetopt FLOW_CONTROL # Disable start/stop characters in shell editor.
-# Treat these characters as part of a word.
-WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
-
#
# Styles
#
View
@@ -0,0 +1,63 @@
+Editor
+======
+
+Sets key bindings.
+
+Settings
+--------
+
+### Key bindings
+
+To enable key bindings, add the following to *zpreztorc*, and replace 'map' with
+'emacs' or 'vi'.
+
+ zstyle ':prezto:module:editor' keymap 'map'
+
+### Dot Expansion
+
+To enable the auto conversion of .... to ../.., add the following to
+*zpreztorc*.
+
+ zstyle ':prezto:module:editor' dot-expansion 'yes'
+
+Theming
+-------
+
+To indicate when the editor is in the primary keymap (emacs or viins), add
+the following to your `theme_prompt_setup` function.
+
+ zstyle ':prezto:module:editor:info:keymap:primary' format '>>>'
+
+To indicate when the editor is in the primary keymap (emacs or viins) insert
+mode, add the following to your `theme_prompt_setup` function.
+
+ zstyle ':prezto:module:editor:info:keymap:primary:insert' format 'I'
+
+To indicate when the editor is in the primary keymap (emacs or viins) overwrite
+mode, add the following to your `theme_prompt_setup` function.
+
+ zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format 'O'
+
+To indicate when the editor is in the alternate keymap (vicmd), add the
+following to your `theme_prompt_setup` function.
+
+ zstyle ':prezto:module:editor:info:keymap:alternate' format '<<<'
+
+To indicate when the editor is completing, add the following to your
+`theme_prompt_setup` function.
+
+ zstyle ':prezto:module:editor:info:completing' format '...'
+
+Then add `$editor_info[context]`, where context is *keymap*, *insert*, or
+*overwrite*, to `$PROMPT` or `$RPROMPT` and call `editor-info` in the
+`prompt_name_preexec` hook function.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][1].*
+
+ - [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+
View
@@ -4,42 +4,6 @@
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
#
-# Usage:
-# To enable key bindings, add the following to zpreztorc, and replace 'map'
-# with 'emacs' or 'vi.
-#
-# zstyle ':prezto:module:editor' keymap 'map'
-#
-# To enable the auto conversion of .... to ../.., add the following to
-# zpreztorc.
-#
-# zstyle ':prezto:module:editor' dot-expansion 'yes'
-#
-# To indicate when the editor is in the primary keymap (emacs or viins), add
-# the following to your theme prompt setup function.
-#
-# zstyle ':prezto:module:editor:info:keymap:primary' format '>>>'
-#
-# To indicate when the editor is in the primary keymap (emacs or viins) insert
-# mode, add the following to your theme prompt setup function.
-#
-# zstyle ':prezto:module:editor:info:keymap:primary:insert' format 'I'
-#
-# To indicate when the editor is in the primary keymap (emacs or viins)
-# overwrite mode, add the following to your theme prompt setup function.
-#
-# zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format 'O'
-#
-# To indicate when the editor is in the alternate keymap (vicmd), add the
-# following to your theme prompt setup function.
-#
-# zstyle ':prezto:module:editor:info:keymap:alternate' format '<<<'
-#
-# To indicate when the editor is completing, add the following to your theme
-# prompt setup function.
-#
-# zstyle ':prezto:module:editor:info:completing' format '...'
-#
# Return if requirements are not found.
if [[ "$TERM" == 'dumb' ]]; then
@@ -57,6 +21,9 @@ setopt BEEP
# Variables
#
+# Treat these characters as part of a word.
+WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
+
# Use human-friendly identifiers.
zmodload zsh/terminfo
typeset -gA key_info
@@ -90,12 +57,11 @@ key_info=(
'BackTab' "$terminfo[kcbt]"
)
-# Do not bind any keys if there are empty values in $key_info.
+# Set empty $key_info values to an invalid UTF-8 sequence to induce silent
+# bindkey failure.
for key in "${(k)key_info[@]}"; do
if [[ -z "$key_info[$key]" ]]; then
- print "prezto: one or more keys are non-bindable" >&2
- unset key{,_info}
- return 1
+ key_info["$key"]=''
fi
done
View
@@ -0,0 +1,33 @@
+Emacs
+=====
+
+Enables Emacs dependency management.
+
+Dependency management
+---------------------
+
+[Carton][1] installs and manages Emacs packages for Emacs package development
+and Emacs configuration.
+
+This module prepends the Carton directory to the path variable to enable the
+execution of `carton`.
+
+Aliases
+-------
+
+### Carton
+
+ - `cai` installs dependencies.
+ - `cau` updates dependencies.
+ - `caI` initializes the current directory for dependency management.
+ - `cae` executes a command which correct dependencies.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][2].*
+
+ - [Sebastian Wiesner](https://github.com/lunaryorn)
+
+[1]: https://github.com/rejeep/carton
+[2]: https://github.com/sorin-ionescu/prezto/issues
View
@@ -0,0 +1,25 @@
+#
+# Configures Emacs dependency management.
+#
+# Authors: Sebastian Wiesner <lunaryorn@gmail.com>
+#
+
+# Return if requirements are not found.
+if [[ ! -d "$HOME/.carton" ]]; then
+ return 1
+fi
+
+# Prepend Carton bin directory.
+path=($HOME/.carton/bin $path)
+
+# Load Carton completion
+source "$HOME/.carton/etc/carton_completion.zsh" 2> /dev/null
+
+#
+# Aliases
+#
+
+alias cai='carton install'
+alias cau='carton update'
+alias caI='carton init'
+alias cae='carton exec'
@@ -17,6 +17,8 @@ zle -N self-insert url-quote-magic
#
setopt BRACE_CCL # Allow brace character class list expansion.
+setopt COMBINING_CHARS # Combine zero-length punctuation characters (accents)
+ # with the base character.
setopt RC_QUOTES # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'.
unsetopt MAIL_WARNING # Don't print a warning message if a mail file has been accessed.
Oops, something went wrong.

0 comments on commit c0f4127

Please sign in to comment.