1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-22 12:20:07 +00:00
Commit graph

848 commits

Author SHA1 Message Date
Christo Kotze
9c02c6e4d8 All code should now be functional
*Fingers crossed*
2018-02-22 22:46:53 +04:00
Christo Kotze
90d0fb1c32 Updated test for trunc_to_unique
Instead of testing for number of folders, now only tests if string is
longer than 1 character.
2018-02-22 22:42:01 +04:00
Logan Brown
58377b2766 feature: add custom number of newlines after prompt 2018-02-19 17:22:14 -07:00
Christo Kotze
a699393d58 Fixed error in coding
Shouldn't code when tired lol.
2018-02-19 22:12:16 +04:00
Christo Kotze
115b656790 Forgot to update code when creating new func 2018-02-19 22:08:06 +04:00
Christo Kotze
21b7749075 Added truncatePath to utilities.zsh
Added `function truncatePath()` to utilities.zsh to take care of
truncation. This is pure zsh code, without calls to `sed`. Parameters
are:
   * $1 Path: string - the directory path to be truncated
   * $2 Length: integer - length to truncate to
   * $3 Delimiter: string - the delimiter to use
   * $4 From: string - "right" | "middle". If omited, assumes right.

Cleaned up code to use the new function instead.
2018-02-19 22:00:15 +04:00
Christo Kotze
58342612eb Improved truncation code 2018-02-19 16:05:58 +04:00
Christo Kotze
fb09d75391 Updated truncate_to_unique 2018-02-18 22:56:52 +04:00
Christo Kotze
3b182d2eb6 Updated code for testing 2018-02-18 22:35:20 +04:00
Christo Kotze
9f87bd5654 Added / for non-home folders 2018-02-18 19:05:37 +04:00
Christo Kotze
38d7e60ae3 Rewrote trunc middle/right to use for loop 2018-02-18 18:36:18 +04:00
Christo Kotze
0acdc4e032 Fixed another typo - shouldn't code when sick :p 2018-02-18 16:58:06 +04:00
Christo Kotze
97d4e2877d Fixed typo 2018-02-18 16:56:32 +04:00
Christo Kotze
8180d724ef Added test for dir_length == trunc_length 2018-02-18 16:35:07 +04:00
Christo Kotze
b1b0ad949a Updated truncate_from_right test 2018-02-18 16:29:05 +04:00
Christo Kotze
4f1da4a64d Changed current_dir - Test Travis response 2018-02-18 16:22:59 +04:00
Christo Kotze
9a3dd6bf25 Fix issue with SHORTEN_DELIM
If `$POWERLEVEL9K_SHORTEN_DELIMITER` is a unicode escape sequence, its
length is 6 instead of 1. Added variable to hold actual character(s)
2018-02-17 21:09:27 +04:00
Christo Kotze
728aa0ec38 Updated previous test as Travis still fails 2018-02-17 20:42:35 +04:00
Christo Kotze
b73af072c1 Fixed truncate_from_right to incl length of delim
Updated length test to include delimiter length.
Added comments
2018-02-17 18:54:43 +04:00
Christo Kotze
29620f3d81 Accidentally deleted )) which threw an error 2018-02-17 18:39:39 +04:00
Christo Kotze
ad4b284e56 Fixed accidentally truncating current folder too 2018-02-17 18:26:11 +04:00
Christo Kotze
110f54f7e2 Added edge case tests for ~ and /
Fixed edge cases
2018-02-17 18:12:07 +04:00
Christo Kotze
64cbdaf4c2 Streamlined dir strategies
Removed sed from `truncate_middle`, `truncate_from_right` and partially
from `truncate_with_package_name`
2018-02-17 17:36:36 +04:00
Christo Kotze
c71e735c7d More code cleaning (extra %F calls) 2018-02-14 12:33:36 +04:00
Christo Kotze
9c6330624e Cleaned up DIR_PATH_HIGHLIGHT code
Removed double call to %F and changed $x variables to ${x} for
consistency.
2018-02-14 12:15:56 +04:00
Christo Kotze
2e417ec510 Explicitly test if DIR_OMIT_FIRST_CHARACTER = true
Changed ${POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER} to
"${(L)POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER}" == "true" Lines 876 & 882
2018-02-14 11:57:32 +04:00
Christo Kotze
7cca0876e2 Fixed = instead of == inside [[]] line 865
Missed an = inside the test for highlighting the last dir of the working
directory. Travis should work now *fingers crossed*
2018-02-14 11:48:14 +04:00
Christo Kotze
536549ea62 Parameter substitution instead of dirname/basename
Replaced external calls to `dirname` and `basename` with paramater
substitution.
2018-02-14 11:42:40 +04:00
Daniel Tam
eb1c6ec1fc
Refactor absolute char truncation 2018-02-13 22:18:26 +11:00
Michael Louwrens
7fff5bd7a6 add new icons and add remote_sudo 2018-02-12 11:28:00 +02:00
Christo Kotze
5491ee35c3 Updated logic in prompt_dir
Added a case where there is no last dir foreground, but still bold.
2018-02-11 17:49:09 +04:00
Christo Kotze
4ac02b0f1b Renamed $bd to $bld 2018-02-11 16:38:16 +04:00
Christo Kotze
4d71e217e9 Attempt to fix Travis error 2018-02-11 16:31:30 +04:00
Christo Kotze
e644ad640e Changed testing for bold last dir 2018-02-11 07:53:09 +04:00
Christo Kotze
1949fa7b9e Added set_default for bold dir segment
Added `set_default POWERLEVEL9K_DIR_PATH_HIGHLIGHT_BOLD false`
2018-02-11 07:48:22 +04:00
Christo Kotze
cd1387f530 Fixed reset bold on last dir missing.
Missed the `%b` on making the last dir bold which leaked into the
command prompt.
2018-02-11 07:17:50 +04:00
Michael Louwrens
3893785873 try out sudo icon changes 2018-02-10 21:24:06 +02:00
Michael Louwrens
0551854a9e fix typo 2018-02-10 21:01:09 +02:00
Michael Louwrens
06802647a1 change sudo detection method 2018-02-10 20:50:59 +02:00
Michael Louwrens
7b8656f8e7 add sudo status to context and user prompts 2018-02-10 19:46:31 +02:00
Christo Kotze
8b8dcb2066 Last dir bold - missed reset
Missed the bold reset code `%b` in the logic, which caused everthing
after the last dir to be bold, including the command line entry.
2018-02-10 15:41:40 +04:00
Christo Kotze
ccba1cc823 PROMPT_DIR color/bold on last dir & color for sep.
You can now set the last dir to have a custom color with
`POWERLEVEL9K_DIR_PATH_HIGHLIGHT_FOREGROUND` and whether it will be bold
with `POWERLEVEL9K_DIR_PATH_HIGHLIGHT_BOLD=true`. You can also set a
custom separator color with `POWERLEVEL9K_DIR_PATH_SEPARATOR_FOREGROUND`.
2018-02-10 14:46:56 +04:00
Christo Kotze
6d25e18779 Merged truncate_to_unique & state NOT_WRITABLE
Added `truncate_to_unique` and `NOT_WRITABLE` to @dritter's code.
2018-02-10 14:23:27 +04:00
Christo Kotze
085a78b9b8 Incorporated @dritter 's changes into next
These are the changes made by @dritter on `async_all_the_segments`
2018-02-10 13:54:05 +04:00
Christo Kotze
d841e1d0d0 Fix iTerm2 integration with PowerLevel9k
This fix allows the user to see the "little blue triangle" that is
created when iTerm2 shell integration is enabled.
2018-02-10 13:29:04 +04:00
Matthew Hoener
162caba19c Don't show segment if POWERLEVEL9K_VI_INSERT_MODE_STRING == '' 2018-02-07 16:51:12 -08:00
Matthew Hoener
c69d21016c Fix vi mode plugin 2018-02-07 14:56:48 -08:00
Daniel Tam
04850df750
Add absolute truncation option to dir segment 2018-02-03 20:14:52 +11:00
Ben Hilburn
fd3d234354
Merge pull request #681 from Stazer/tcolor-warning
Added flag to ignore checking the term colors & lang settings
2018-01-30 16:44:27 -05:00
Ben Hilburn
f994a7c349
Minor fix of copy/paste error 2018-01-30 16:41:34 -05:00
Ben Hilburn
8090d13962
Merge pull request #717 from onaforeignshore/date_segment
Added `prompt_date` and fixed segment comments
2018-01-24 14:21:01 -05:00
LeMarsu
3a94826ed1 fix: Remove dependency of bc for load widget 2018-01-15 08:58:05 +01:00
Justus Flerlage
f7aae86b78 added POWERLEVEL9K_IGNORE_TERM_LANG for disabling term_lang check 2018-01-07 21:35:33 +01:00
Justus Flerlage
3a605c7f62 renamed POWERLEVEL9K_CHECK_TERM_COLORS to POWERLEVEL9K_IGNORE_TERM_COLORS 2018-01-07 21:35:33 +01:00
Justus Flerlage
4db2eb0e16 Added flag for checking the term colors 2018-01-07 21:34:46 +01:00
Ben Hilburn
4718458c75
Merge pull request #677 from lemaral/POWERLEVEL9K_PUBLIC_IP_VPN_INTERFACE
Replace PUBLIC_IP_ICON with VPN_ICON if VPN is up
2018-01-06 15:28:05 -05:00
Ben Hilburn
58fc02f152 Merge branch 'Artistan-master' into next 2018-01-06 15:02:14 -05:00
Christo Kotze
550db296de Updates to prompt_date and prompt_time
Using `set_default` to set the defaults - makes the code shorter and more
readable and bypasses errors.
2018-01-05 13:15:52 +04:00
Christo Kotze
6d116ab24b Added prompt_date and fixed segment comments
Added separators for all segments (####)
Added descriptions for missing ones
2018-01-05 11:04:04 +04:00
Charles Peterson
0c943ac6d5 colors checking optimized and added tput for check the colors
moved to colors functions, because it makes sense.
2017-12-31 14:34:01 -06:00
lemaral
42a0125f4c
Fix newline issue 2017-12-31 14:18:49 +01:00
Charles Peterson
ef0f8f0ba4 make sure the default colors are encoded properly in case they are named... 2017-12-31 00:54:58 -06:00
Richard Tippl
5d645e07bf Add remote state to context prompt
Adds REMOTE state to color prompt with in case of a shell over ssh.
This state has lower priority than ROOT state to not lose the privilege
warning.
2017-12-23 15:06:33 +01:00
Charles Peterson
4d18fdc6e9 fix for colors since the terminals so not always render named colors when using parameter expansion. 2017-12-15 15:42:35 -06:00
Ben Hilburn
786dc5b3f2
Merge pull request #697 from geniusupgrader/next
OpenFOAM support! (fixes #696)
2017-12-14 16:36:53 -05:00
Ben Hilburn
ea05b4ebe6 Merge branch 'master' into next 2017-12-14 15:20:02 -05:00
Ben Hilburn
c50eb9cdda
Merge pull request #686 from Corwynt/master
Fixed Issue with whitespaces in path.
2017-12-14 15:15:09 -05:00
Robin Rosenstock
f5f73f25e5 fixes #696 2017-12-11 22:40:06 +01:00
Torben Hartmann
02fbaf2c4b IFS Fix attemp 2017-12-05 17:30:49 +01:00
David Jetelina
ea062a1708
Fix of k8s shorter segment
My latest PR #676 seemed to have been incompatible with #661 - I did my PR on top of master instead of next. This one is done on top of next and should fix the current not so great state of next (prints nothing). Sorry!
2017-12-05 10:21:31 +01:00
Ben Hilburn
3d79ca1adc
Merge pull request #684 from Artistan/color_names
Use color names, plus fixes
2017-12-04 19:33:57 -05:00
Ben Hilburn
efacc622a7
Merge pull request #680 from dinhnv/pyenv-patched
pyenv promt segment uses $PYENV_VERSION environment variable"
2017-12-04 19:20:53 -05:00
Ben Hilburn
b2d3c396c3 Merge branch 'master' into next 2017-12-04 19:15:33 -05:00
Torben Hartmann
6e931f6047 Fixed Issue with whitespaces in path. 2017-11-27 21:38:03 +01:00
Charles Peterson
264897a426 color names and fixes
- fix for packageName truncated by POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER
     - processing the pwd/HOME replacement ONCE.
     - fix tests for named colors
     - use color names by default to allow dark/light themes to adjust colors based on names
2017-11-25 12:46:45 -06:00
dinhnv
bc8a83208f pyenv promt segment uses $PYENV_VERSION environment variable" 2017-11-22 11:30:24 +07:00
lemaral
7f9669d28a
Replace PUBLIC_IP_ICON with VPN_ICON if VPN is up
Replace PUBLIC_IP_ICON with VPN_ICON if $POWERLEVEL9K_PUBLIC_IP_VPN_INTERFACE is set and up
2017-11-14 22:23:19 +01:00
David Jetelina
b8afde5598
added forgotten $ 2017-11-14 19:01:20 +01:00
David Jetelina
37f24dcc5f
Kubernetes segment shorter if possible
Fixes #675
2017-11-14 18:58:16 +01:00
Ben Hilburn
9d59daf18d Merge branch 'master' into next 2017-11-10 10:33:37 -05:00
Ben Hilburn
3b2d47febd
Merge pull request #666 from ParthKolekar/patch-1
Allow showing the number of jobs even if there is <= 1 job present.
2017-11-10 10:31:32 -05:00
Ben Hilburn
46fb03ed19
Updating variable name for always showing jobs count 2017-11-10 10:28:50 -05:00
Antons Kranga
82bc300c62 Add support for both AWS_PROFILE and AWS_DEFAULT_PROFILE 2017-11-07 11:30:23 +02:00
Parth Laxmikant Kolekar
7db892408f
Update powerlevel9k.zsh-theme
Allow showing the number of jobs even if there is <= 1 job present.
2017-11-05 14:33:23 +09:00
Ben Hilburn
eb2e1b0e96 Merge branch 'master' into next 2017-11-02 14:38:20 -04:00
Ben Hilburn
948e7f5bff
Merge pull request #660 from brianmoran/ISS-650-pythonpath-in-prompt
ISS-650 Fix PYTHONPATH appearing in prompt
2017-11-02 14:37:24 -04:00
Marc Hauptmann
47c7077cde declared variables as 'local'
Prevents warning messages from zsh
2017-10-31 16:48:49 +01:00
Derek Bassett
1c2774f592 Fix to unit tests. Also removed unneeded extra call to kubectl. 2017-10-27 11:55:21 -06:00
Brian Moran
43e766209b ISS-650 Fix PYTHONPATH appearing in prompt
- Modify prompt_dir function to set current_path based on pwd and
replace $HOME with ~
2017-10-27 12:11:48 -04:00
Jordan Taylor
e6d882ac47 Added functionality to parse the current namespace regardless of config settings 2017-10-18 21:57:31 -04:00
Ben Hilburn
f46617acd3 Merge branch 'master' into next 2017-10-17 21:33:40 -04:00
sbutler2901
20b69370a6 Bug fix for prompt_public_ip. The OSX date command does not have the -r option for getting the last modification time of a file. The stat command is being used instead 2017-10-12 02:02:45 -04:00
Ben Hilburn
ad74199822 Adding SIG to signal name, removing - sign. 2017-10-06 22:34:44 -04:00
Ben Hilburn
2a7f3966c2 Merge branch 'master' into next 2017-10-06 21:43:43 -04:00
Chris Chou
5657fe6ac7 #632: Indicate Rust or (rust) for rust_version segment only if icon is unavailable 2017-10-06 09:47:37 +13:00
Timothy Earley
985dac910c Don't show when dropbox is not running 2017-10-02 14:24:06 +02:00
Timothy Earley
81cbd65142 Added dropbox segment 2017-10-01 17:53:07 +02:00
Hal Gentz
ec47f1b583
These probably have similar bugs
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
2017-09-28 22:20:58 -06:00
Hal Gentz
f996d2d6ed
Fixes issue #619
Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
2017-09-28 22:07:37 -06:00
Ben Hilburn
e9e60324cd Merge branch 'master' into next 2017-09-28 18:11:28 -04:00
Ben Hilburn
386a39671f Merge pull request #616 from trashbat/patch-2
Changed "less than" to "fewer than".
2017-09-28 17:33:22 -04:00
Ben Hilburn
9ab067bd62 Merge pull request #610 from sjoeboo/rbenv_always
Add ability to always show rbenv prompt
2017-09-28 17:30:03 -04:00
Ben Hilburn
748f9868fc Final cleanup for new POWERLEVEL9K_RBENV_ALWAYS flag 2017-09-28 17:27:59 -04:00
Matt Nicholson
79a73ef4aa add ability to force rbenv being shown 2017-09-06 10:25:18 -04:00
trashbat
692335975c Changed "less than" to "fewer than". 2017-09-05 15:46:12 +01:00
Yann David
48b4bd1aa4
Fix prompt_kubecontext:local:1: not valid in this context: Version: 2017-08-31 14:15:11 -04:00
Richard Tippl
2c388b6c80 Fix average selection in load segment.
Removed duplicate code selecting which load average to use.
Fixed load average selection being in OSX/BSD part of if, making it not work
on non OSX/BSD systems.
Optimized actually getting the load average.
2017-08-27 22:42:52 +02:00
Tadek Teleżyński
582edf200c Add average choice to load extension
This commit adds a functionality to choose if one wants to see 1, 5 or
15 minutes average.

Resolves issue #604
2017-08-17 21:54:26 +02:00
Ben Hilburn
9f4faf7f21 Merge pull request #596 from eumiro/truncate_to_unique
Add TRUNCATE_TO_UNIQUE shortening dir strategy
2017-08-12 13:52:10 -04:00
Ben Hilburn
e464b4e2a5 Adding reference for truncate_to_unique code. 2017-08-12 13:49:50 -04:00
Ben Hilburn
02332d5962 Merge branch 'master' into next 2017-08-12 13:46:08 -04:00
Miroslav Šedivý
73a9ee7c87 add TRUNCATE_TO_UNIQUE shortening dir strategy
This creates the shortest unique path elements that can be unambiguously expanded to the original path.
2017-08-11 22:44:18 +02:00
Kaleb Elwert
99b7ec26b2 Add back the prompt_sp option for zsh >= 5.4.1
In 5.4.1, this option was reset between prompts, so to retain the
previous default behavior, this should be added back.
2017-08-10 11:56:12 -07:00
Richard Tippl
c4a1d91118 Added a default value for DIR_SHOW_WRITABLE.
Variable POWERLEVEL9K_DIR_SHOW_WRITABLE is now default set to false.
2017-08-10 17:49:42 +02:00
Richard Tippl
b567ab22c2 Implemented functionality from dir_writable to dir
When variable POWERLEVEL9K_DIR_SHOW_WRITABLE is set to true, dir prompt
will have new state NOT_WRITABLE.

This state will be set when user doesn't have permission to write in
current working directory as in prompt dir_writable.

When mode that allows icons is set, LOCK_ICON is used.
2017-08-10 17:14:13 +02:00
Ben Hilburn
93a1c4d2e8 Merge pull request #581 from docwhat/pr/show-signals
status: show signal name
2017-08-03 15:59:08 -04:00
Ben Hilburn
df9b99c2da Merge pull request #580 from sei40kr/master
Fixed Vi mode indicator issue
2017-08-02 11:56:10 -04:00
Seong Yong-ju
0b298e7df4 Fixed an issue of indicator of Vi mode
Fixed an issue that the indicator of Vi mode won't appear correctly at
first.
2017-07-29 13:45:11 +09:00
Christian Höltje
f93ad073b7 status: show signal name
This makes signal exit status easy to understand.  Instead of just
showing exit code "137", you now see "KILL(-9)".

Based on #580 by @sei40kr (thanks!)
2017-07-27 22:36:11 -04:00
Christian Höltje
be6c032025 rvm: handle -head, etc. more gracefully.
Closes #575
2017-07-26 23:39:49 -04:00
Ben Hilburn
0bcef50e29 Merge pull request #573 from AdrienHorgnies/feature/status-cross-ok-option-set
Update `status` segment to provide additional configuration option, streamline settings flags.
2017-07-26 21:17:02 -04:00
Ben Hilburn
c7cd2d54cf Merge pull request #541 from golgoth31/next
vpn prompt: change "ip" to "ifconfig" to be used on OSX
2017-07-17 13:33:30 -04:00
AdrienHorgnies
a4f1ce990b change status segment option set 2017-07-15 21:28:27 +02:00
Ben Hilburn
c69d45cdcc Merge pull request #569 from docwhat/pr/home-folder-abbr-test
Added tests and replaced a sed call
2017-07-13 11:33:21 -04:00
Christian Höltje
8626d07d60 Merge remote-tracking branch 'origin/master' into pr/merge-master 2017-07-13 00:42:15 -04:00
Ben Hilburn
c88cea7f3f Merge pull request #562 from docwhat/pr/cleanup-directory-detection
Cleaned up installation directory detection
2017-07-12 10:13:01 -04:00
Christian Höltje
aca0f31eb0 Replaced a sed call with pure ZSH 2017-07-12 01:02:46 -04:00
Christian Höltje
3bf0f18e26 Cleaned up installation directory detection
- Used ZSH built-in magic to get the installation directory.
- Works with symlinks.
- No longer calls out to external program 'dirname'.
- Fixed issue with spaces in the path.
- No longer leak the variables 'filename' and 'script_location'.
2017-07-11 20:29:01 -04:00
Derek Bassett
3dddcf519d Resolves issue #553 where prompt hangs on kubectl version. 2017-06-26 13:51:41 -06:00
Pavel Peganov
65c770606b Fixed RVM segment for usernames with dashes
Having a username with a dash, such as mine, `d-side`, currently results in RVM segment displaying the wrong thing, e. g. `side/.rvm/rubies/ruby`. This fixes the issue.
2017-06-11 04:09:00 +03:00
David Sabatie
9a3d2e4ca1 vpn prompt: change "ip" to "ifconfig" to be used on OSX 2017-06-03 20:11:24 +02:00
Ben Hilburn
e09d4ae926 Merge branch 'next' into next 2017-06-02 12:09:35 -04:00
David Sabatie
5eec2e28d0 add vpn ip to prompt 2017-05-31 17:32:42 +02:00
Jason Hutchinson
6f0c809a7d empty namespace value is 'default' 2017-05-26 13:35:29 -05:00
Jason Hutchinson
932e4edeaf fix variable name typo 2017-05-26 13:29:06 -05:00
Jason Hutchinson
c11c3a55de use p9k print_icon for kubecontext segment 2017-05-26 13:27:17 -05:00
Jordan Taylor
d8d6c752fd added the current context prompt for your kubectl config 2017-05-26 09:02:14 -04:00
Jason Hutchinson
99c9ba9367 add Gopher icon to go_version segment 2017-05-25 16:38:14 -05:00
Ben Hilburn
92264124a9 Merge branch 'master' into next 2017-05-25 16:01:08 -04:00
Ben Hilburn
d9014c67a3 Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-host_user 2017-05-25 15:47:51 -04:00
Christo Kotze
cf806f097b updated render check logic 2017-05-23 19:14:52 +04:00
Ben Hilburn
b63bf00113 Merge pull request #473 from zikes/patch-1
Only show go_version segment if inside GOPATH
2017-05-22 21:55:49 -04:00
Ben Hilburn
44764285c3 Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-host_user 2017-05-22 21:46:17 -04:00
Ben Hilburn
643e8372db Merge branch 'next' of github.com:bhilburn/powerlevel9k into next 2017-05-22 21:45:17 -04:00
Ben Hilburn
5beb77bdf4 Merge branch 'master' into next 2017-05-22 21:39:44 -04:00
Ben Hilburn
65f5f7a90f Merge pull request #531 from shibumi/next
swapped colors for virtualization detection
2017-05-22 21:34:42 -04:00
Ben Hilburn
6f7e88474d Merge pull request #526 from docwhat/pr/nvm-current
nvm: improve default detection
2017-05-22 21:32:41 -04:00
Ben Hilburn
a7409272ac Fixing typo in #525 to teardown RPROMPT 2017-05-22 21:20:56 -04:00
Ben Hilburn
c04c51bc8b Merge branch 'pr/teardown' of https://github.com/docwhat/powerlevel9k into docwhat-pr/teardown 2017-05-22 21:17:10 -04:00
Ben Hilburn
e844fc4c72 Incorporating @dritter's feedback from #524. 2017-05-22 21:12:59 -04:00