* misc/rb_optparse.zsh: update how to install.

* misc/rb_optparse.zsh: avoid error when setopt noclobber.

* lib/optparse.rb: fix typo. pointed out at
  <http://d.hatena.ne.jp/nagachika/20101207>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,12 @@
+Sun Dec 12 20:35:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* misc/rb_optparse.zsh: update how to install.
+
+	* misc/rb_optparse.zsh: avoid error when setopt noclobber.
+
+	* lib/optparse.rb: fix typo. pointed out at
+	  <http://d.hatena.ne.jp/nagachika/20101207>.
+
 Sun Dec 12 13:27:35 2010  Tanaka Akira  <akr@fsij.org>
 
 	* eval_error.c: parenthesize macro arguments.

lib/optparse.rb

@@ -784,7 +784,8 @@ XXX
     end
   end
 
-  # --*-completion-for-bash=WORD
+  #
+  # --*-completion-bash=WORD
   # Shows candidates for command line completion.
   #
   Officious['*-completion-bash'] = proc do |parser|

misc/rb_optparse.zsh

@@ -2,12 +2,18 @@
 # Completion for zsh:
 # (based on <http://d.hatena.ne.jp/rubikitch/20071002/zshcomplete>)
 #
-# (1) install this file,
+# (1) install this file.
+#      mkdir -p ~/.zsh.d
+#      cp rb_optparse.zsh ~/.zsh.d/rb_optparse.zsh
 #
-# (2) load the script, and
-#      . ~/.zsh.d/rb_optparse.zsh
+# (2) load the script in ~/.zshrc.
+#      echo '. ~/.zsh.d/rb_optparse.zsh' >> ~/.zshrc
+#      echo 'fpath=("${ZSH_COMPLETION_DIR-$HOME/.zsh.d/Completion}" $fpath)' >> ~/.zshrc
+#      echo 'autoload -U ${ZSH_COMPLETION_DIR-$HOME/.zsh.d/Completion}/*(:t)' >> ~/.zshrc
 #
-# (3) geneate completion files once.
+# (3) restart zsh.
+#
+# (4) geneate completion files once.
 #      generate-complete-function/ruby/optparse COMMAND1
 #      generate-complete-function/ruby/optparse COMMAND2
 #
@@ -16,7 +22,7 @@ generate-complete-function/ruby/optparse ()
 {
     local cmpl="_${1:t}"
     mkdir -p "${ZSH_COMPLETION_DIR-$HOME/.zsh.d/Completion}"
-    $1 "--*-completion-zsh=${1:t}" > "${ZSH_COMPLETION_DIR-$HOME/.zsh.d/Completion}/$cmpl"
+    $1 "--*-completion-zsh=${1:t}" >! "${ZSH_COMPLETION_DIR-$HOME/.zsh.d/Completion}/$cmpl"
     if [[ $(type -w "$cmpl") == "${cmpl}: function" ]]; then
 	unfunction "$cmpl"
 	autoload -U "$cmpl"