Auto merge of #565 - kbknapp:issue-563, r=kbknapp

Issue 563

CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="2.9.2"></a>
+### 2.9.2 (2016-07-03)
+
+
+#### Documentation
+
+* **Completions:**  fixes the formatting of the Cargo.toml excerpt in the completions example ([722f2607](https://github.com/kbknapp/clap-rs/commit/722f2607beaef56b6a0e433db5fd09492d9f028c))
+
+#### Bug Fixes
+
+* **Completions:**  fixes bug where --help and --version short weren't added to the completion list ([e9f2438e](https://github.com/kbknapp/clap-rs/commit/e9f2438e2ce99af0ae570a2eaf541fc7f55b771b), closes [#536](https://github.com/kbknapp/clap-rs/issues/536))
+
+
+
 <a name="2.9.1"></a>
 ### 2.9.1 (2016-07-02)
 

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "clap"
-version = "2.9.1"
+version = "2.9.2"
 authors = ["Kevin K. <kbknapp@gmail.com>"]
 exclude = ["examples/*", "clap-test/*", "tests/*", "benches/*", "*.png", "clap-perf/*", "*.dot"]
 description = "A simple to use, efficient, and full featured  Command Line Argument Parser"

README.md

@@ -39,6 +39,12 @@ Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)
 
 ## What's New
 
+Here's the highlights for v2.9.2
+
+
+* fixes bug where --help and --version short weren't added to the completion list
+* improves completions allowing multiple bins to have seperate completion files
+
 Here's the highlights for v2.9.0
 
 * **Completions:**  one can now [generate a bash completions](http://kbknapp.github.io/clap-rs/clap/struct.App.html#method.gen_completions) script at compile time! These completions work with options using [possible values](http://kbknapp.github.io/clap-rs/clap/struct.Arg.html#method.possible_values), [subcommand aliases](http://kbknapp.github.io/clap-rs/clap/struct.App.html#method.aliases), and even multiple levels of subcommands

src/app/parser.rs

@@ -1030,6 +1030,9 @@ impl<'a, 'b> Parser<'a, 'b>
                 help: Some("Prints help information"),
                 ..Default::default()
             };
+            if let Some(h) = self.help_short {
+                self.short_list.push(h);
+            }
             self.long_list.push("help");
             self.flags.push(arg);
         }
@@ -1047,6 +1050,9 @@ impl<'a, 'b> Parser<'a, 'b>
                 help: Some("Prints version information"),
                 ..Default::default()
             };
+            if let Some(v) = self.version_short {
+                self.short_list.push(v);
+            }
             self.long_list.push("version");
             self.flags.push(arg);
         }