Delete trailing spaces

This commit is contained in:
mathbunnyru
2017-01-16 01:51:10 +03:00
committed by Kurtis Rader
parent d37e7bcc25
commit 7a80610300
34 changed files with 128 additions and 128 deletions

View File

@@ -4,9 +4,9 @@
**fish version installed** *(`fish --version`)*: **fish version installed** *(`fish --version`)*:
**OS/terminal used**: **OS/terminal used**:
Talk about the the issue here. Talk about the the issue here.
## Reproduction steps ## Reproduction steps
1. step one 1. step one

2
.gitignore vendored
View File

@@ -88,7 +88,7 @@ messages.pot
/tests/*.tmp.* /tests/*.tmp.*
/share/pkgconfig /share/pkgconfig
# xcode # xcode
## Build generated ## Build generated
build/ build/
DerivedData/ DerivedData/

View File

@@ -506,7 +506,7 @@ Bug Fixes
* **fish_indent is fixed.** In particular, the `funced` and `funcsave` functions work again. * **fish_indent is fixed.** In particular, the `funced` and `funcsave` functions work again.
* A SIGTERM now ends the whole execution stack again (resolving #13). * A SIGTERM now ends the whole execution stack again (resolving #13).
* Bumped the __fish_config_interactive version number so the default fish_color_autosuggestion kicks in. * Bumped the __fish_config_interactive version number so the default fish_color_autosuggestion kicks in.
* fish_config better handles combined term256 and classic colors like "555 yellow". * fish_config better handles combined term256 and classic colors like "555 yellow".
New Features New Features
------------ ------------
@@ -564,4 +564,4 @@ The large number of forks relative to bash are due to fish's insanely expensive
The large reduction in lstat() numbers is due to fish no longer needing to call ttyname() on OS X. The large reduction in lstat() numbers is due to fish no longer needing to call ttyname() on OS X.
We've got some work to do to be as lean as bash, but we're on the right track. We've got some work to do to be as lean as bash, but we're on the right track.

View File

@@ -837,7 +837,7 @@ RECURSIVE = NO
# Note that relative paths are relative to the directory from which doxygen is # Note that relative paths are relative to the directory from which doxygen is
# run. # run.
EXCLUDE = EXCLUDE =
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded # directories that are symbolic links (a Unix file system feature) are excluded

View File

@@ -249,7 +249,7 @@ show-%:
# #
all: show-CXX show-CXXFLAGS $(PROGRAMS) $(user_doc) $(share_man) $(TRANSLATIONS) fish.pc share/__fish_build_paths.fish all: show-CXX show-CXXFLAGS $(PROGRAMS) $(user_doc) $(share_man) $(TRANSLATIONS) fish.pc share/__fish_build_paths.fish
ifneq (,$(findstring install,$(MAKECMDGOALS))) ifneq (,$(findstring install,$(MAKECMDGOALS)))
# Fish has been built, but if the goal was 'install', we aren't done yet and this output isnt't desirable # Fish has been built, but if the goal was 'install', we aren't done yet and this output isnt't desirable
@echo "$(green)fish has now been built.$(sgr0)" @echo "$(green)fish has now been built.$(sgr0)"
@echo "Run $(yellow)$(notdir $(MAKE)) install$(sgr0) to install fish.$(sgr0)" @echo "Run $(yellow)$(notdir $(MAKE)) install$(sgr0) to install fish.$(sgr0)"
endif endif
@@ -465,7 +465,7 @@ lexicon_filter: lexicon.txt lexicon_filter.in | show-SED
else \ else \
WORDBL='\\<'; WORDBR='\\>'; \ WORDBL='\\<'; WORDBR='\\>'; \
fi; $(SED) <lexicon.txt >>$@.tmp -n -e "s|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,$$WORDBL\2$$WORDBR,@\1{\2},g|p" -e '$$G;s/.*\n/b tidy/p'; fi; $(SED) <lexicon.txt >>$@.tmp -n -e "s|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,$$WORDBL\2$$WORDBR,@\1{\2},g|p" -e '$$G;s/.*\n/b tidy/p';
$v mv $@.tmp $@; test -x $@ || chmod a+x $@; $v mv $@.tmp $@; test -x $@ || chmod a+x $@;
# #
@@ -608,7 +608,7 @@ check-legacy-binaries:
.PHONY: check-legacy-binaries .PHONY: check-legacy-binaries
install: all install-force | check-legacy-binaries install: all install-force | check-legacy-binaries
@echo @echo
@echo "$(bo)fish is now installed on your system.$(sgr0)" @echo "$(bo)fish is now installed on your system.$(sgr0)"
@echo "To run fish, type $(bo)$(green)fish$(sgr0) in your terminal." @echo "To run fish, type $(bo)$(green)fish$(sgr0) in your terminal."
@echo "$(T_YELLOW)Even if you are already in fish, you should now start a new fish session.$(sgr0)" @echo "$(T_YELLOW)Even if you are already in fish, you should now start a new fish session.$(sgr0)"
@@ -744,7 +744,7 @@ uninstall: uninstall-translations | show-prefix show-bindir show-sysconfdir show
@echo @echo
@echo "In 5 seconds, $(red)all data$(sgr0) (includes functions, completions, tools) in" @echo "In 5 seconds, $(red)all data$(sgr0) (includes functions, completions, tools) in"
@echo $$"\t$(bo)$(DESTDIR)$(datadir)/fish$(sgr0) will be deleted!" @echo $$"\t$(bo)$(DESTDIR)$(datadir)/fish$(sgr0) will be deleted!"
@echo @echo
@echo $$"If you put things there, $(red)stop now!$(sgr0) $(bo)\\c" @echo $$"If you put things there, $(red)stop now!$(sgr0) $(bo)\\c"
@echo $$"$(bo)5$(sgr0) \\c" @echo $$"$(bo)5$(sgr0) \\c"
@sleep 1 @sleep 1
@@ -777,7 +777,7 @@ uninstall: uninstall-translations | show-prefix show-bindir show-sysconfdir show
@echo "[ $(bo)"$(basename $(MANUALS))$(sgr0) $$"] in \\c" @echo "[ $(bo)"$(basename $(MANUALS))$(sgr0) $$"] in \\c"
@echo "$(em)$(mandir)/man1$(sgr0)" @echo "$(em)$(mandir)/man1$(sgr0)"
-$v for i in $(MANUALS); do \ -$v for i in $(MANUALS); do \
rm -rf "$(DESTDIR)$(mandir)/man1/"$$$(basename $i)$$$(wildcard .*); rm -rf "$(DESTDIR)$(mandir)/man1/"$$$(basename $i)$$$(wildcard .*);
done; done;
@echo @echo
@echo "$(green)Fish (likely) unintalled$(sgr0)" @echo "$(green)Fish (likely) unintalled$(sgr0)"
@@ -806,7 +806,7 @@ uninstall-translations: show-DESTDIR show-localedir
# #
# How basic files get compiled # How basic files get compiled
# #
obj/%.o: src/%.cpp | show-CXX show-CXXFLAGS show-CPPFLAGS obj obj/%.o: src/%.cpp | show-CXX show-CXXFLAGS show-CPPFLAGS obj
@echo " CXX $(em)$@$(sgr0)" @echo " CXX $(em)$@$(sgr0)"
$v $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ $v $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
@@ -847,7 +847,7 @@ fish_indent: $(FISH_INDENT_OBJS) $(EXTRA_PCRE2)
$v $(CXX) $(CXXFLAGS) $(LDFLAGS) $(FISH_INDENT_OBJS) $(LIBS) -o $@ $v $(CXX) $(CXXFLAGS) $(LDFLAGS) $(FISH_INDENT_OBJS) $(LIBS) -o $@
# #
# Build the fish_key_reader program to show input from the terminal. # Build the fish_key_reader program to show input from the terminal.
# #
fish_key_reader: $(FISH_KEYREAD_OBJS) $(EXTRA_PCRE2) fish_key_reader: $(FISH_KEYREAD_OBJS) $(EXTRA_PCRE2)
@echo " CXX LD $(em)$@$(sgr0)" @echo " CXX LD $(em)$@$(sgr0)"
@@ -864,7 +864,7 @@ fish_key_reader: $(FISH_KEYREAD_OBJS) $(EXTRA_PCRE2)
# exactly the files that result in objects, leaving the #include'd files # exactly the files that result in objects, leaving the #include'd files
# behind. # behind.
# #
depend: | show-MKDIR_P depend: | show-MKDIR_P
@echo " CXX LD $(em)$@$(sgr0)" @echo " CXX LD $(em)$@$(sgr0)"
$v $(MKDIR_P) /tmp/fish_make_depend/src $v $(MKDIR_P) /tmp/fish_make_depend/src
# This is ran only once in a blue moon - full verbosity so we are reminded what it does. # This is ran only once in a blue moon - full verbosity so we are reminded what it does.

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env fish #!/usr/bin/env fish
# #
# This file produces command specific completions for darcs. Meant to be # This file produces command specific completions for darcs. Meant to be
# executed from the root directory (so the completions get put in the right # executed from the root directory (so the completions get put in the right
# place). # place).
. build_tools/make_vcs_completions_generic.fish . build_tools/make_vcs_completions_generic.fish

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env fish #!/usr/bin/env fish
# #
# This file provides generic functions for generating specific completions for # This file provides generic functions for generating specific completions for
# hg, darcs and a few other vcs systems. It uses the fact that all these # hg, darcs and a few other vcs systems. It uses the fact that all these
# systems have a somewhat uniform command line help mechanism. # systems have a somewhat uniform command line help mechanism.
# #

View File

@@ -8,13 +8,13 @@
\f0\fs30 \cf0 Fish is a smart and user friendly command line shell. For more information, visit {\field{\*\fldinst{HYPERLINK "https://fishshell.com"}}{\fldrslt https://fishshell.com}}\ \f0\fs30 \cf0 Fish is a smart and user friendly command line shell. For more information, visit {\field{\*\fldinst{HYPERLINK "https://fishshell.com"}}{\fldrslt https://fishshell.com}}\
\ \
fish will be installed into fish will be installed into
\f1\fs26 /usr/local/ \f1\fs26 /usr/local/
\f0\fs30 , and fish will be added to \f0\fs30 , and fish will be added to
\f1\fs26 /etc/shells \f1\fs26 /etc/shells
\f0\fs30 if necessary.\ \f0\fs30 if necessary.\
\ \
Your default shell will Your default shell will
\i not \i not
\i0 be changed. To make fish your default, run:\ \i0 be changed. To make fish your default, run:\
\ \

View File

@@ -8,7 +8,7 @@ While the documentation is pretty robust to variations in the documentation sour
## Line breaks and wrapping ## Line breaks and wrapping
Contrary to the rest of the fish source code, the documentation greatly benefits from the use of long lines and soft wrapping. It allows paragraphs to be treated as complete blocks by Doxygen, means that the semantic filter can see complete lines when deciding on how to apply syntax highlighting, and means that man pages will consistently wrap to the width of the users console in advanced pagers, such as 'most'. Contrary to the rest of the fish source code, the documentation greatly benefits from the use of long lines and soft wrapping. It allows paragraphs to be treated as complete blocks by Doxygen, means that the semantic filter can see complete lines when deciding on how to apply syntax highlighting, and means that man pages will consistently wrap to the width of the users console in advanced pagers, such as 'most'.
## Doxygen special commands and aliases ## Doxygen special commands and aliases
@@ -16,7 +16,7 @@ While Markdown syntax forms the basis of the documentation content, there are so
### Structure: \\page, \\section and \\subsection ### Structure: \\page, \\section and \\subsection
Use of Doxygen sections markers are important, as these determine what will be eventually output as a web page, man page or included in the developer docs. Use of Doxygen sections markers are important, as these determine what will be eventually output as a web page, man page or included in the developer docs.
Currently the make process for the documentation is quite convoluted, but basically the HTML docs are produced from a single, compiled file, doc.h. This contains a number of \\page markers that produce the various pages used in the documentation. The format of a \\page mark is: Currently the make process for the documentation is quite convoluted, but basically the HTML docs are produced from a single, compiled file, doc.h. This contains a number of \\page markers that produce the various pages used in the documentation. The format of a \\page mark is:
@@ -175,7 +175,7 @@ ___ (3 underscores): Display a cursor.
Graphical keyboard shortcuts can be defined using the following special commands. These allow for the different text requirements across the html and man pages. The HTML uses CSS to create a keyboard style, whereas the man page would display the key as text. Graphical keyboard shortcuts can be defined using the following special commands. These allow for the different text requirements across the html and man pages. The HTML uses CSS to create a keyboard style, whereas the man page would display the key as text.
- `@key{lable}` - `@key{lable}`
Displays a key with a purely textual lable, such as: 'Tab', 'Page Up', 'Page Down', 'Home', 'End', 'F1', 'F19' and so on. Displays a key with a purely textual lable, such as: 'Tab', 'Page Up', 'Page Down', 'Home', 'End', 'F1', 'F19' and so on.
- `@key{modifier,lable}` - `@key{modifier,lable}`
Displays a keystroke requiring the use of a 'modifier' key, such as 'Control-A', 'Shift-X', 'Alt-Tab' etc. Displays a keystroke requiring the use of a 'modifier' key, such as 'Control-A', 'Shift-X', 'Alt-Tab' etc.
@@ -204,7 +204,7 @@ Some useful Unicode/HTML5 entities:
Tested on: Tested on:
- Ubuntu 14.04 with Doxygen 1.8.8, built from [GitHub source](https://github.com/doxygen/doxygen.git). - Ubuntu 14.04 with Doxygen 1.8.8, built from [GitHub source](https://github.com/doxygen/doxygen.git).
- CentOS 6.5 with Doxygen 1.8.8, built from [GitHub source](https://github.com/doxygen/doxygen.git). - CentOS 6.5 with Doxygen 1.8.8, built from [GitHub source](https://github.com/doxygen/doxygen.git).
- Mac OS X 10.9 with Homebrew install Doxygen 1.8.7 and 1.8.8. - Mac OS X 10.9 with Homebrew install Doxygen 1.8.7 and 1.8.8.
Graphviz was also installed in all the above testing. Graphviz was also installed in all the above testing.

View File

@@ -7,7 +7,7 @@
\endhtmlonly \endhtmlonly
`fish` Copyright © 2005-2009 Axel Liljencrantz. `fish` is released under the GNU General Public License, version 2. `fish` Copyright © 2005-2009 Axel Liljencrantz. `fish` is released under the GNU General Public License, version 2.
`fish` includes other code licensed under the GNU General Public License, version 2, including GNU `printf`: `fish` includes other code licensed under the GNU General Public License, version 2, including GNU `printf`:

View File

@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define PCRE2_MAJOR 10 #define PCRE2_MAJOR 10
#define PCRE2_MINOR 21 #define PCRE2_MINOR 21
#define PCRE2_PRERELEASE #define PCRE2_PRERELEASE
#define PCRE2_DATE 2016-01-12 #define PCRE2_DATE 2016-01-12
/* When an application links to a PCRE DLL in Windows, the symbols that are /* When an application links to a PCRE DLL in Windows, the symbols that are

View File

@@ -17,7 +17,7 @@ function __fish_busctl
end end
command busctl $mode $argv --no-legend --no-pager ^/dev/null command busctl $mode $argv --no-legend --no-pager ^/dev/null
end end
# Only get the arguments to the actual command, skipping all options and arguments to options # Only get the arguments to the actual command, skipping all options and arguments to options
function __fish_busctl_get_command_args function __fish_busctl_get_command_args
set -l skip set -l skip
@@ -49,7 +49,7 @@ function __fish_busctl_get_command_args
end end
end end
end end
function __fish_busctl_busnames function __fish_busctl_busnames
__fish_busctl list --acquired | string replace -r '\s+.*$' '' __fish_busctl list --acquired | string replace -r '\s+.*$' ''
# Describe unique names (":1.32") with their process (e.g. `:1.32\tsteam`) # Describe unique names (":1.32") with their process (e.g. `:1.32\tsteam`)
@@ -63,7 +63,7 @@ end
function __fish_busctl_interfaces -a busname -a object function __fish_busctl_interfaces -a busname -a object
__fish_busctl introspect --list $busname $object | string replace -r '\s+.*$' '' __fish_busctl introspect --list $busname $object | string replace -r '\s+.*$' ''
end end
function __fish_busctl_members -a type -a busname -a object -a interface function __fish_busctl_members -a type -a busname -a object -a interface
__fish_busctl introspect --list $busname $object $interface \ __fish_busctl introspect --list $busname $object $interface \
| string match -- "* $type *" | string replace -r '.(\S+) .*' '$1' | string match -- "* $type *" | string replace -r '.(\S+) .*' '$1'

View File

@@ -1,7 +1,7 @@
# Tab completion for cargo (https://github.com/rust-lang/cargo). # Tab completion for cargo (https://github.com/rust-lang/cargo).
complete -e -c cargo complete -e -c cargo
complete -c cargo -s h -l help complete -c cargo -s h -l help
complete -c cargo -s V -l version -d 'Print version info and exit' complete -c cargo -s V -l version -d 'Print version info and exit'
complete -c cargo -l list -d 'List installed commands' complete -c cargo -l list -d 'List installed commands'
complete -c cargo -s v -l verbose -d 'Use verbose output' complete -c cargo -s v -l verbose -d 'Use verbose output'

View File

@@ -23,7 +23,7 @@ complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "state"
complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "technologies" -d "Display technologies" complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "technologies" -d "Display technologies"
complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "clock" -d "Get System Clock Properties" complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "clock" -d "Get System Clock Properties"
complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "enable" -d "Enables given technology or offline mode" complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "enable" -d "Enables given technology or offline mode"
complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] enable" -a "(__fish_print_connman_technologies) offline" complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] enable" -a "(__fish_print_connman_technologies) offline"
complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "disable" -d "Disables given technology or offline mode" complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "disable" -d "Disables given technology or offline mode"
complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] disable" -a "(__fish_print_connman_technologies) offline" complete -f -c connmanctl -n "test (count (commandline -opc)) -eq 2; and contains -- (commandline -opc)[2] disable" -a "(__fish_print_connman_technologies) offline"
complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "tether" -d "Enable, disable tethering, set SSID and passphrase for wifi" complete -f -c connmanctl -n "test (count (commandline -opc)) -lt 2" -a "tether" -d "Enable, disable tethering, set SSID and passphrase for wifi"

View File

@@ -19,4 +19,4 @@ else # OS X
complete -c date -s u -d 'Display or set the date int UTC time' complete -c date -s u -d 'Display or set the date int UTC time'
complete -c date -s v -d 'Adjust the time component backward(-)/forward(+) according to VAL' -x complete -c date -s v -d 'Adjust the time component backward(-)/forward(+) according to VAL' -x
end end

View File

@@ -28,9 +28,9 @@ complete -c dropbox -n "__fish_seen_subcommand_from help" -xa "$subcommands"
complete -c dropbox -n "__fish_seen_subcommand_from start" -s i -l install -d "Auto install dropboxd if not available on the system" complete -c dropbox -n "__fish_seen_subcommand_from start" -s i -l install -d "Auto install dropboxd if not available on the system"
complete -c dropbox -n "__fish_seen_subcommand_from filestatus stat" -s l -l list -d "Prints out information in a format similar to ls. works best when your console supports color :)" complete -c dropbox -n "__fish_seen_subcommand_from filestatus stat" -s l -l list -d "Prints out information in a format similar to ls. works best when your console supports color :)"
complete -c dropbox -n "__fish_seen_subcommand_from filestatus stat ls" -s a -l all -d "Do not ignore entries starting with ." complete -c dropbox -n "__fish_seen_subcommand_from filestatus stat ls" -s a -l all -d "Do not ignore entries starting with ."
complete -c dropbox -n "__fish_seen_subcommand_from autostart lansync" -xa '(echo -e "y\tEnable\nn\tDisable")' complete -c dropbox -n "__fish_seen_subcommand_from autostart lansync" -xa '(echo -e "y\tEnable\nn\tDisable")'
set -l needs_excl_arg "__fish_seen_subcommand_from exclude; and not __fish_seen_subcommand_from list add remove" set -l needs_excl_arg "__fish_seen_subcommand_from exclude; and not __fish_seen_subcommand_from list add remove"
complete -c dropbox -n $needs_excl_arg -xa list -d "Prints a list of directories currently excluded from syncing" complete -c dropbox -n $needs_excl_arg -xa list -d "Prints a list of directories currently excluded from syncing"
complete -c dropbox -n $needs_excl_arg -xa add -d "Adds one or more directories to the exclusion list" complete -c dropbox -n $needs_excl_arg -xa add -d "Adds one or more directories to the exclusion list"
complete -c dropbox -n $needs_excl_arg -xa remove -d "Removes one or more directories from the exclusion list" complete -c dropbox -n $needs_excl_arg -xa remove -d "Removes one or more directories from the exclusion list"

View File

@@ -26,7 +26,7 @@ complete -c figlet -s W -d "Makes FIGlet all FIGcharacters at full width"
complete -c figlet -s o -d "Cause `overlapped`" complete -c figlet -s o -d "Cause `overlapped`"
complete -c figlet -s m -d "Specify layout mode between 1 and 63" complete -c figlet -s m -d "Specify layout mode between 1 and 63"
complete -c figlet -s v -d "Print version and copyright" complete -c figlet -s v -d "Print version and copyright"
complete -c figlet -s I -d "Print information given infocode" -x -a "0\tVersion\ and\ copyright 1\tVersion\ \(integer\) 2\tDefault\ font\ directory 3\tFont 4\tOutput\ width 5\tSupported\ font\ format" complete -c figlet -s I -d "Print information given infocode" -x -a "0\tVersion\ and\ copyright 1\tVersion\ \(integer\) 2\tDefault\ font\ directory 3\tFont 4\tOutput\ width 5\tSupported\ font\ format"
complete -c figlet -s L -d "Print left-to-right" complete -c figlet -s L -d "Print left-to-right"
complete -c figlet -s R -d "Print right-to-left" complete -c figlet -s R -d "Print right-to-left"
complete -c figlet -s X -d "Print with default text direction" complete -c figlet -s X -d "Print with default text direction"

View File

@@ -320,7 +320,7 @@ function __fish_complete_ip
end end
end end
end end
complete -f -c ip complete -f -c ip
complete -f -c ip -a '(__fish_complete_ip)' complete -f -c ip -a '(__fish_complete_ip)'
complete -f -c ip -n "not __fish_seen_subcommand_from $ip_all_commands" -a "$ip_commands" complete -f -c ip -n "not __fish_seen_subcommand_from $ip_all_commands" -a "$ip_commands"

View File

@@ -42,9 +42,9 @@ if test (uname) != 'SunOS'
complete -c killall -s s -d 'Simulate, but do not send any signals' complete -c killall -s s -d 'Simulate, but do not send any signals'
complete -c killall -s d -d 'Print detailed info. Doesn\'t send signals' complete -c killall -s d -d 'Print detailed info. Doesn\'t send signals'
complete -c killall -s u -x -d 'Only processes for USER' complete -c killall -s u -x -d 'Only processes for USER'
# Completions for users # Completions for users
__make_users_completions __make_users_completions
complete -c killall -s t -d 'Limit to processes running on specified TTY' complete -c killall -s t -d 'Limit to processes running on specified TTY'
complete -c killall -s t -xa "(ps a -o tty | sed 1d | uniq)" complete -c killall -s t -xa "(ps a -o tty | sed 1d | uniq)"
complete -c killall -s c -x -d 'Limit to processes matching specified PROCNAME' complete -c killall -s c -x -d 'Limit to processes matching specified PROCNAME'
complete -c killall -s z -d 'Do not skip zombies' complete -c killall -s z -d 'Do not skip zombies'

View File

@@ -2,7 +2,7 @@
# Checks if we are using GNU tools # Checks if we are using GNU tools
if mkdir --version > /dev/null ^ /dev/null if mkdir --version > /dev/null ^ /dev/null
complete -c mkdir -l version --description 'Output version' complete -c mkdir -l version --description 'Output version'
complete -c mkdir -s m -l mode --description 'Set file mode (as in chmod)' -x complete -c mkdir -s m -l mode --description 'Set file mode (as in chmod)' -x
complete -c mkdir -s p -l parents --description 'Make parent directories as needed' complete -c mkdir -s p -l parents --description 'Make parent directories as needed'
complete -c mkdir -s v -l verbose --description 'Print a message for each created directory' complete -c mkdir -s v -l verbose --description 'Print a message for each created directory'
complete -c mkdir -l help --description 'Display help' complete -c mkdir -l help --description 'Display help'

View File

@@ -3,7 +3,7 @@
function __fish_mkinitcpio_complete_hooks function __fish_mkinitcpio_complete_hooks
mkinitcpio --listhooks | tail -n +2 | sed -e "s/^[¹²³].*//" -e "s/\t\+/\n/g" | sed -e "s/^\([^[:space:]]\+\)[¹²³]\$/\1\t(deprecated)/g" mkinitcpio --listhooks | tail -n +2 | sed -e "s/^[¹²³].*//" -e "s/\t\+/\n/g" | sed -e "s/^\([^[:space:]]\+\)[¹²³]\$/\1\t(deprecated)/g"
end end
complete -c mkinitcpio -s A -l addhooks -d 'Add the additional hooks to the image' -a "(__fish_mkinitcpio_complete_hooks)" -f complete -c mkinitcpio -s A -l addhooks -d 'Add the additional hooks to the image' -a "(__fish_mkinitcpio_complete_hooks)" -f
complete -c mkinitcpio -s c -l config -d 'Use config file to generate the ramdisk' complete -c mkinitcpio -s c -l config -d 'Use config file to generate the ramdisk'
complete -c mkinitcpio -s d -l generatedir -d 'Set directory as the location where the initramfs is built' complete -c mkinitcpio -s d -l generatedir -d 'Set directory as the location where the initramfs is built'

View File

@@ -1,5 +1,5 @@
# Sample output of 'mkvmerge -i file.mkv' # Sample output of 'mkvmerge -i file.mkv'
# #
# File 'file.mkv': container: Matroska # File 'file.mkv': container: Matroska
# Track ID 0: video (MPEG-4p10/AVC/h.264) # Track ID 0: video (MPEG-4p10/AVC/h.264)
# Track ID 1: audio (AAC) # Track ID 1: audio (AAC)

View File

@@ -23,7 +23,7 @@ function __fish_pa_print_type
pactl list short $argv pactl list short $argv
# Pa allows both a numerical index and a name # Pa allows both a numerical index and a name
pactl list short $argv | string replace -r '(\w+)\t.*' '$1' pactl list short $argv | string replace -r '(\w+)\t.*' '$1'
end end
function __fish_pa_list_ports function __fish_pa_list_ports
# Yes, this is localized # Yes, this is localized

View File

@@ -2,7 +2,7 @@
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
complete -e -c rustc complete -e -c rustc
complete -c rustc -s h -l help complete -c rustc -s h -l help
complete -c rustc -x -l cfg complete -c rustc -x -l cfg
complete -c rustc -r -s L -a 'dylib= static= framework=' complete -c rustc -r -s L -a 'dylib= static= framework='

View File

@@ -1,4 +1,4 @@
set -l commands status set-time{,zone} list-timezones set-local-rtc set-ntp set -l commands status set-time{,zone} list-timezones set-local-rtc set-ntp
complete -c timedatectl -f complete -c timedatectl -f
complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "status" complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "status"

View File

@@ -3,7 +3,7 @@
# ========================= # =========================
# #
# Adrien Grellier <adrien.grellier@laposte.net> # Adrien Grellier <adrien.grellier@laposte.net>
# #
function __fish_vim-addons_subcommand --description 'Test if vim-addons has yet to be given the subcommand' function __fish_vim-addons_subcommand --description 'Test if vim-addons has yet to be given the subcommand'
for i in (commandline -opc) for i in (commandline -opc)

View File

@@ -1,6 +1,6 @@
complete -f -c yast2 -a '(yast2 -l)' -d 'Module' complete -f -c yast2 -a '(yast2 -l)' -d 'Module'
complete -f -c yast2 -s h -l help -d 'Show help' complete -f -c yast2 -s h -l help -d 'Show help'
complete -f -c yast2 -s l -l list -d 'List all available modules' complete -f -c yast2 -s l -l list -d 'List all available modules'
complete -f -c yast2 -l qt -d 'Use the QT graphical user interface' complete -f -c yast2 -l qt -d 'Use the QT graphical user interface'
complete -f -c yast2 -l gtk -d 'Use the GTK graphical user interface' complete -f -c yast2 -l gtk -d 'Use the GTK graphical user interface'

View File

@@ -21,7 +21,7 @@ function __fish_complete_tar -d "Peek inside of archives and list all files"
printf (_ "%s\tArchived file\n") $file_list printf (_ "%s\tArchived file\n") $file_list
end end
return return
case '*.tar.xz' case '*.tar.xz'
if test -f $i if test -f $i
set -l file_list (tar -Jt <$i) set -l file_list (tar -Jt <$i)

View File

@@ -38,7 +38,7 @@ function __fish_config_interactive -d "Initializations that should be performed
# bump this to 2_4_0 when rolling release if anything changes after 9/10/2016 # bump this to 2_4_0 when rolling release if anything changes after 9/10/2016
if not set -q __fish_init_2_39_8 if not set -q __fish_init_2_39_8
# Regular syntax highlighting colors # Regular syntax highlighting colors
# XXX - not quite the same as default colors in web config. Sync these up. # XXX - not quite the same as default colors in web config. Sync these up.
set -q fish_color_normal set -q fish_color_normal
or set -U fish_color_normal normal or set -U fish_color_normal normal
set -q fish_color_command set -q fish_color_command

View File

@@ -117,7 +117,7 @@ body {
padding-top: 6px; padding-top: 6px;
padding-bottom: 11px; padding-bottom: 11px;
padding-left: 5px; padding-left: 5px;
padding-right: 22px; padding-right: 22px;
font-size: 12pt; font-size: 12pt;
/* Make our border overlap the detail, even if we're unselected (so it doesn't jump when selected) */ /* Make our border overlap the detail, even if we're unselected (so it doesn't jump when selected) */
position: relative; position: relative;
@@ -130,10 +130,10 @@ body {
border: 1px solid #555; border: 1px solid #555;
border-right: none; border-right: none;
background-color: #181818; background-color: #181818;
border-top-left-radius: 5; border-top-left-radius: 5;
border-bottom-left-radius: 5; border-bottom-left-radius: 5;
/* Pad one less than .master_element, to accomodate our border. */ /* Pad one less than .master_element, to accomodate our border. */
padding-top: 5px; padding-top: 5px;
padding-bottom: 10px; padding-bottom: 10px;
@@ -231,7 +231,7 @@ body {
vertical-align: top; vertical-align: top;
overflow:hidden; overflow:hidden;
border-bottom: #444 dotted 1px; border-bottom: #444 dotted 1px;
word-wrap: break-word; word-wrap: break-word;
} }
.history_delete { .history_delete {

View File

@@ -203,7 +203,7 @@ function nextUid() {
/** /**
* Set or clear the hashkey for an object. * Set or clear the hashkey for an object.
* @param obj object * @param obj object
* @param h the hashkey (!truthy to delete the hashkey) * @param h the hashkey (!truthy to delete the hashkey)
*/ */
function setHashKey(obj, h) { function setHashKey(obj, h) {
@@ -2154,21 +2154,21 @@ forEach({
} }
} }
return false; return false;
}; };
events[type] = []; events[type] = [];
// Refer to jQuery's implementation of mouseenter & mouseleave // Refer to jQuery's implementation of mouseenter & mouseleave
// Read about mouseenter and mouseleave: // Read about mouseenter and mouseleave:
// http://www.quirksmode.org/js/events_mouse.html#link8 // http://www.quirksmode.org/js/events_mouse.html#link8
var eventmap = { mouseleave : "mouseout", mouseenter : "mouseover"} var eventmap = { mouseleave : "mouseout", mouseenter : "mouseover"}
bindFn(element, eventmap[type], function(event) { bindFn(element, eventmap[type], function(event) {
var ret, target = this, related = event.relatedTarget; var ret, target = this, related = event.relatedTarget;
// For mousenter/leave call the handler if related is outside the target. // For mousenter/leave call the handler if related is outside the target.
// NB: No relatedTarget if the mouse left/entered the browser window // NB: No relatedTarget if the mouse left/entered the browser window
if ( !related || (related !== target && !contains(target, related)) ){ if ( !related || (related !== target && !contains(target, related)) ){
handle(event, type); handle(event, type);
} }
}); });
@@ -3472,18 +3472,18 @@ function $BrowserProvider(){
* *
* @description * @description
* Factory that constructs cache objects and gives access to them. * Factory that constructs cache objects and gives access to them.
* *
* <pre> * <pre>
* *
* var cache = $cacheFactory('cacheId'); * var cache = $cacheFactory('cacheId');
* expect($cacheFactory.get('cacheId')).toBe(cache); * expect($cacheFactory.get('cacheId')).toBe(cache);
* expect($cacheFactory.get('noSuchCacheId')).not.toBeDefined(); * expect($cacheFactory.get('noSuchCacheId')).not.toBeDefined();
* *
* cache.put("key", "value"); * cache.put("key", "value");
* cache.put("another key", "another value"); * cache.put("another key", "another value");
* *
* expect(cache.info()).toEqual({id: 'cacheId', size: 2}); // Since we've specified no options on creation * expect(cache.info()).toEqual({id: 'cacheId', size: 2}); // Since we've specified no options on creation
* *
* </pre> * </pre>
* *
* *
@@ -3660,10 +3660,10 @@ function $CacheFactoryProvider() {
* @name ng.$templateCache * @name ng.$templateCache
* *
* @description * @description
* The first time a template is used, it is loaded in the template cache for quick retrieval. You can * The first time a template is used, it is loaded in the template cache for quick retrieval. You can
* load templates directly into the cache in a `script` tag, or by consuming the `$templateCache` * load templates directly into the cache in a `script` tag, or by consuming the `$templateCache`
* service directly. * service directly.
* *
* Adding via the `script` tag: * Adding via the `script` tag:
* <pre> * <pre>
* <html ng-app> * <html ng-app>
@@ -3675,29 +3675,29 @@ function $CacheFactoryProvider() {
* ... * ...
* </html> * </html>
* </pre> * </pre>
* *
* **Note:** the `script` tag containing the template does not need to be included in the `head` of the document, but * **Note:** the `script` tag containing the template does not need to be included in the `head` of the document, but
* it must be below the `ng-app` definition. * it must be below the `ng-app` definition.
* *
* Adding via the $templateCache service: * Adding via the $templateCache service:
* *
* <pre> * <pre>
* var myApp = angular.module('myApp', []); * var myApp = angular.module('myApp', []);
* myApp.run(function($templateCache) { * myApp.run(function($templateCache) {
* $templateCache.put('templateId.html', 'This is the content of the template'); * $templateCache.put('templateId.html', 'This is the content of the template');
* }); * });
* </pre> * </pre>
* *
* To retrieve the template later, simply use it in your HTML: * To retrieve the template later, simply use it in your HTML:
* <pre> * <pre>
* <div ng-include=" 'templateId.html' "></div> * <div ng-include=" 'templateId.html' "></div>
* </pre> * </pre>
* *
* or get it via Javascript: * or get it via Javascript:
* <pre> * <pre>
* $templateCache.get('templateId.html') * $templateCache.get('templateId.html')
* </pre> * </pre>
* *
* See {@link ng.$cacheFactory $cacheFactory}. * See {@link ng.$cacheFactory $cacheFactory}.
* *
*/ */
@@ -6902,25 +6902,25 @@ function $ParseProvider() {
* you can treat promises attached to a scope as if they were the resulting values. * you can treat promises attached to a scope as if they were the resulting values.
* - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
* all the important functionality needed for common async tasks. * all the important functionality needed for common async tasks.
* *
* # Testing * # Testing
* *
* <pre> * <pre>
* it('should simulate promise', inject(function($q, $rootScope) { * it('should simulate promise', inject(function($q, $rootScope) {
* var deferred = $q.defer(); * var deferred = $q.defer();
* var promise = deferred.promise; * var promise = deferred.promise;
* var resolvedValue; * var resolvedValue;
* *
* promise.then(function(value) { resolvedValue = value; }); * promise.then(function(value) { resolvedValue = value; });
* expect(resolvedValue).toBeUndefined(); * expect(resolvedValue).toBeUndefined();
* *
* // Simulate resolving of promise * // Simulate resolving of promise
* deferred.resolve(123); * deferred.resolve(123);
* // Note that the 'then' function does not get called synchronously. * // Note that the 'then' function does not get called synchronously.
* // This is because we want the promise API to always be async, whether or not * // This is because we want the promise API to always be async, whether or not
* // it got called synchronously or asynchronously. * // it got called synchronously or asynchronously.
* expect(resolvedValue).toBeUndefined(); * expect(resolvedValue).toBeUndefined();
* *
* // Propagate promise resolution to 'then' functions using $apply(). * // Propagate promise resolution to 'then' functions using $apply().
* $rootScope.$apply(); * $rootScope.$apply();
* expect(resolvedValue).toEqual(123); * expect(resolvedValue).toEqual(123);
@@ -8140,7 +8140,7 @@ function $RootScopeProvider(){
* *
* @description * @description
* Broadcasted when a scope and its children are being destroyed. * Broadcasted when a scope and its children are being destroyed.
* *
* Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
* clean up DOM bindings before an element is removed from the DOM. * clean up DOM bindings before an element is removed from the DOM.
*/ */
@@ -8164,7 +8164,7 @@ function $RootScopeProvider(){
* Just before a scope is destroyed a `$destroy` event is broadcasted on this scope. * Just before a scope is destroyed a `$destroy` event is broadcasted on this scope.
* Application code can register a `$destroy` event handler that will give it chance to * Application code can register a `$destroy` event handler that will give it chance to
* perform any necessary cleanup. * perform any necessary cleanup.
* *
* Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
* clean up DOM bindings before an element is removed from the DOM. * clean up DOM bindings before an element is removed from the DOM.
*/ */
@@ -12677,8 +12677,8 @@ var ngValueDirective = function() {
* Typically, you don't use `ngBind` directly, but instead you use the double curly markup like * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
* `{{ expression }}` which is similar but less verbose. * `{{ expression }}` which is similar but less verbose.
* *
* It is preferrable to use `ngBind` instead of `{{ expression }}` when a template is momentarily * It is preferrable to use `ngBind` instead of `{{ expression }}` when a template is momentarily
* displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an * displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an
* element attribute, it makes the bindings invisible to the user while the page is loading. * element attribute, it makes the bindings invisible to the user while the page is loading.
* *
* An alternative solution to this problem would be using the * An alternative solution to this problem would be using the
@@ -13174,20 +13174,20 @@ var ngControllerDirective = [function() {
* @element html * @element html
* @description * @description
* Enables [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) support. * Enables [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) support.
* *
* This is necessary when developing things like Google Chrome Extensions. * This is necessary when developing things like Google Chrome Extensions.
* *
* CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things). * CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things).
* For us to be compatible, we just need to implement the "getterFn" in $parse without violating * For us to be compatible, we just need to implement the "getterFn" in $parse without violating
* any of these restrictions. * any of these restrictions.
* *
* AngularJS uses `Function(string)` generated functions as a speed optimization. By applying `ngCsp` * AngularJS uses `Function(string)` generated functions as a speed optimization. By applying `ngCsp`
* it is be possible to opt into the CSP compatible mode. When this mode is on AngularJS will * it is be possible to opt into the CSP compatible mode. When this mode is on AngularJS will
* evaluate all expressions up to 30% slower than in non-CSP mode, but no security violations will * evaluate all expressions up to 30% slower than in non-CSP mode, but no security violations will
* be raised. * be raised.
* *
* In order to use this feature put `ngCsp` directive on the root element of the application. * In order to use this feature put `ngCsp` directive on the root element of the application.
* *
* @example * @example
* This example shows how to apply the `ngCsp` directive to the `html` tag. * This example shows how to apply the `ngCsp` directive to the `html` tag.
<pre> <pre>

View File

@@ -41,9 +41,9 @@ fishconfig.config(function($httpProvider, $compileProvider) {
var global_error_element = null; var global_error_element = null;
var showMessage = function(content) { var showMessage = function(content) {
global_error_element.text(content); global_error_element.text(content);
}; };
$httpProvider.responseInterceptors.push(function($q) { $httpProvider.responseInterceptors.push(function($q) {
return function(promise) { return function(promise) {
return promise.then(function(successResponse) { return promise.then(function(successResponse) {

View File

@@ -74,7 +74,7 @@ function adjust_lightness(color_str, func) {
if (color_str[0] == '#') { if (color_str[0] == '#') {
color_str = color_str.substring(1); color_str = color_str.substring(1);
} }
/* Hack to handle for example F00 */ /* Hack to handle for example F00 */
if (color_str.length == 3) { if (color_str.length == 3) {
color_str = color_str[0] + color_str[0] + color_str[1] + color_str[1] + color_str[2] + color_str[2] color_str = color_str[0] + color_str[0] + color_str[1] + color_str[1] + color_str[2] + color_str[2]
@@ -128,7 +128,7 @@ function text_color_for_color(color_str) {
return adjust_lightness(color_str, compute_constrast); return adjust_lightness(color_str, compute_constrast);
} }
function rgb_to_hsl(r, g, b) { function rgb_to_hsl(r, g, b) {
r /= 255, g /= 255, b /= 255; r /= 255, g /= 255, b /= 255;
var max = Math.max(r, g, b), min = Math.min(r, g, b); var max = Math.max(r, g, b), min = Math.min(r, g, b);
var h, s, l = (max + min) / 2; var h, s, l = (max + min) / 2;
@@ -243,12 +243,12 @@ var color_scheme_fish_default = {
var TomorrowTheme = { var TomorrowTheme = {
tomorrow_night: {'Background': '1d1f21', 'Current Line': '282a2e', 'Selection': '373b41', 'Foreground': 'c5c8c6', 'Comment': '969896', 'Red': 'cc6666', 'Orange': 'de935f', 'Yellow': 'f0c674', 'Green': 'b5bd68', 'Aqua': '8abeb7', 'Blue': '81a2be', 'Purple': 'b294bb' tomorrow_night: {'Background': '1d1f21', 'Current Line': '282a2e', 'Selection': '373b41', 'Foreground': 'c5c8c6', 'Comment': '969896', 'Red': 'cc6666', 'Orange': 'de935f', 'Yellow': 'f0c674', 'Green': 'b5bd68', 'Aqua': '8abeb7', 'Blue': '81a2be', 'Purple': 'b294bb'
}, },
tomorrow: {'Background': 'ffffff', 'Current Line': 'efefef', 'Selection': 'd6d6d6', 'Foreground': '4d4d4c', 'Comment': '8e908c', 'Red': 'c82829', 'Orange': 'f5871f', 'Yellow': 'eab700', 'Green': '718c00', 'Aqua': '3e999f', 'Blue': '4271ae', 'Purple': '8959a8' tomorrow: {'Background': 'ffffff', 'Current Line': 'efefef', 'Selection': 'd6d6d6', 'Foreground': '4d4d4c', 'Comment': '8e908c', 'Red': 'c82829', 'Orange': 'f5871f', 'Yellow': 'eab700', 'Green': '718c00', 'Aqua': '3e999f', 'Blue': '4271ae', 'Purple': '8959a8'
}, },
tomorrow_night_bright: {'Background': '000000', 'Current Line': '2a2a2a', 'Selection': '424242', 'Foreground': 'eaeaea', 'Comment': '969896', 'Red': 'd54e53', 'Orange': 'e78c45', 'Yellow': 'e7c547', 'Green': 'b9ca4a', 'Aqua': '70c0b1', 'Blue': '7aa6da', 'Purple': 'c397d8'}, tomorrow_night_bright: {'Background': '000000', 'Current Line': '2a2a2a', 'Selection': '424242', 'Foreground': 'eaeaea', 'Comment': '969896', 'Red': 'd54e53', 'Orange': 'e78c45', 'Yellow': 'e7c547', 'Green': 'b9ca4a', 'Aqua': '70c0b1', 'Blue': '7aa6da', 'Purple': 'c397d8'},
apply: function(theme, receiver){ apply: function(theme, receiver){
receiver['autosuggestion'] = theme['Comment'] receiver['autosuggestion'] = theme['Comment']
receiver['command'] = theme['Purple'] receiver['command'] = theme['Purple']
@@ -258,7 +258,7 @@ var TomorrowTheme = {
receiver['param'] = theme['Blue'] receiver['param'] = theme['Blue']
receiver['quote'] = theme['Green'] receiver['quote'] = theme['Green']
receiver['redirection'] = theme['Aqua'] receiver['redirection'] = theme['Aqua']
receiver['colors'] = [] receiver['colors'] = []
for (var key in theme) receiver['colors'].push(theme[key]) for (var key in theme) receiver['colors'].push(theme[key])
} }
@@ -273,9 +273,9 @@ var solarized = {
var color_scheme_solarized_light = { var color_scheme_solarized_light = {
name: "Solarized Light", name: "Solarized Light",
colors: dict_values(solarized), colors: dict_values(solarized),
preferred_background: '#' + solarized.base3, preferred_background: '#' + solarized.base3,
autosuggestion: solarized.base1, autosuggestion: solarized.base1,
command: solarized.base01, command: solarized.base01,
comment: solarized.base1, comment: solarized.base1,
@@ -284,7 +284,7 @@ var color_scheme_solarized_light = {
param: solarized.base00, param: solarized.base00,
quote: solarized.base0, quote: solarized.base0,
redirection: solarized.violet, redirection: solarized.violet,
url: 'http://ethanschoonover.com/solarized' url: 'http://ethanschoonover.com/solarized'
}; };
@@ -292,7 +292,7 @@ var color_scheme_solarized_dark = {
name: "Solarized Dark", name: "Solarized Dark",
colors: dict_values(solarized), colors: dict_values(solarized),
preferred_background: '#' + solarized.base03, preferred_background: '#' + solarized.base03,
autosuggestion: solarized.base01, autosuggestion: solarized.base01,
command: solarized.base1, command: solarized.base1,
comment: solarized.base01, comment: solarized.base01,
@@ -301,7 +301,7 @@ var color_scheme_solarized_dark = {
param: solarized.base0, param: solarized.base0,
quote: solarized.base00, quote: solarized.base00,
redirection: solarized.violet, redirection: solarized.violet,
url: 'http://ethanschoonover.com/solarized' url: 'http://ethanschoonover.com/solarized'
}; };
@@ -332,15 +332,15 @@ function construct_scheme_analogous(label, background, color_list) {
name: label, name: label,
preferred_background: background, preferred_background: background,
colors: color_list, colors: color_list,
command: color_list[0], command: color_list[0],
quote: color_list[6], quote: color_list[6],
param: color_list[5], param: color_list[5],
autosuggestion: color_list[4], autosuggestion: color_list[4],
error: color_list[9], error: color_list[9],
comment: color_list[12], comment: color_list[12],
end: color_list[10], end: color_list[10],
redirection: color_list[11] redirection: color_list[11]
}; };
@@ -351,16 +351,16 @@ function construct_scheme_triad(label, background, color_list) {
name: label, name: label,
preferred_background: background, preferred_background: background,
colors: color_list, colors: color_list,
command: color_list[0], command: color_list[0],
quote: color_list[2], quote: color_list[2],
param: color_list[1], param: color_list[1],
autosuggestion: color_list[3], autosuggestion: color_list[3],
redirection: color_list[4], redirection: color_list[4],
error: color_list[8], error: color_list[8],
comment: color_list[10], comment: color_list[10],
end: color_list[7], end: color_list[7],
}; };
} }
@@ -370,30 +370,30 @@ function construct_scheme_complementary(label, background, color_list) {
name: label, name: label,
preferred_background: background, preferred_background: background,
colors: color_list, colors: color_list,
command: color_list[0], command: color_list[0],
quote: color_list[4], quote: color_list[4],
param: color_list[3], param: color_list[3],
autosuggestion: color_list[2], autosuggestion: color_list[2],
redirection: color_list[6], redirection: color_list[6],
error: color_list[5], error: color_list[5],
comment: color_list[8], comment: color_list[8],
end: color_list[9], end: color_list[9],
}; };
} }
function construct_color_scheme_mono(label, background, from_end) { function construct_color_scheme_mono(label, background, from_end) {
var mono_colors = ['000000', '121212', '1c1c1c', '262626', '303030', '3a3a3a', '444444', '4e4e4e', '585858', '5f5f5f', '626262', '6c6c6c', '767676', '808080', '878787', '8a8a8a', '949494', '9e9e9e', 'a8a8a8', 'afafaf', 'b2b2b2', 'bcbcbc', 'c6c6c6', 'd0d0d0', 'd7d7d7', 'dadada', 'e4e4e4', 'eeeeee', 'ffffff']; var mono_colors = ['000000', '121212', '1c1c1c', '262626', '303030', '3a3a3a', '444444', '4e4e4e', '585858', '5f5f5f', '626262', '6c6c6c', '767676', '808080', '878787', '8a8a8a', '949494', '9e9e9e', 'a8a8a8', 'afafaf', 'b2b2b2', 'bcbcbc', 'c6c6c6', 'd0d0d0', 'd7d7d7', 'dadada', 'e4e4e4', 'eeeeee', 'ffffff'];
if (from_end) mono_colors.reverse(); if (from_end) mono_colors.reverse();
return { return {
name: label, name: label,
preferred_background: background, preferred_background: background,
colors: mono_colors, colors: mono_colors,
autosuggestion: '777777', autosuggestion: '777777',
command: mono_colors[0], command: mono_colors[0],
comment: mono_colors[7], comment: mono_colors[7],
@@ -407,21 +407,21 @@ function construct_color_scheme_mono(label, background, from_end) {
var additional_color_schemes = [ var additional_color_schemes = [
construct_scheme_analogous('Snow Day', 'white', ['164CC9', '325197', '072D83', '4C7AE4', '7596E4', '4319CC', '4C3499', '260885', '724EE5', '9177E5', '02BDBD', '248E8E', '007B7B', '39DEDE', '65DEDE']), construct_scheme_analogous('Snow Day', 'white', ['164CC9', '325197', '072D83', '4C7AE4', '7596E4', '4319CC', '4C3499', '260885', '724EE5', '9177E5', '02BDBD', '248E8E', '007B7B', '39DEDE', '65DEDE']),
construct_scheme_analogous('Lava', '#232323', ['FF9400', 'BF8330', 'A66000', 'FFAE40', 'FFC473', 'FFC000', 'BF9C30', 'A67D00', 'FFD040', 'FFDD73', 'FF4C00', 'BF5B30', 'A63100', 'FF7940', 'FF9D73']), construct_scheme_analogous('Lava', '#232323', ['FF9400', 'BF8330', 'A66000', 'FFAE40', 'FFC473', 'FFC000', 'BF9C30', 'A67D00', 'FFD040', 'FFDD73', 'FF4C00', 'BF5B30', 'A63100', 'FF7940', 'FF9D73']),
construct_scheme_analogous('Seaweed', '#232323', ['00BF32', '248F40', '007C21', '38DF64', '64DF85', '04819E', '206676', '015367', '38B2CE', '60B9CE', '8EEB00', '7CB02C', '5C9900', 'ACF53D', 'C0F56E']), construct_scheme_analogous('Seaweed', '#232323', ['00BF32', '248F40', '007C21', '38DF64', '64DF85', '04819E', '206676', '015367', '38B2CE', '60B9CE', '8EEB00', '7CB02C', '5C9900', 'ACF53D', 'C0F56E']),
construct_scheme_triad('Fairground', '#003', ['0772A1', '225E79', '024A68', '3BA3D0', '63AFD0', 'D9005B', 'A3295C', '8D003B', 'EC3B86', 'EC6AA1', 'FFE100', 'BFAE30', 'A69200', 'FFE840', 'FFEE73']), construct_scheme_triad('Fairground', '#003', ['0772A1', '225E79', '024A68', '3BA3D0', '63AFD0', 'D9005B', 'A3295C', '8D003B', 'EC3B86', 'EC6AA1', 'FFE100', 'BFAE30', 'A69200', 'FFE840', 'FFEE73']),
construct_scheme_complementary('Bay Cruise', 'black', ['009999', '1D7373', '006363', '33CCCC', '5CCCCC', 'FF7400', 'BF7130', 'A64B00', 'FF9640', 'FFB273']), construct_scheme_complementary('Bay Cruise', 'black', ['009999', '1D7373', '006363', '33CCCC', '5CCCCC', 'FF7400', 'BF7130', 'A64B00', 'FF9640', 'FFB273']),
{ {
'name': 'Old School', 'name': 'Old School',
'preferred_background': 'black', 'preferred_background': 'black',
colors: ['00FF00', '30BE30', '00A400', '44FF44', '7BFF7B', 'FF0000', 'BE3030', 'A40000', 'FF7B7B', '777777', 'CCCCCC'], colors: ['00FF00', '30BE30', '00A400', '44FF44', '7BFF7B', 'FF0000', 'BE3030', 'A40000', 'FF7B7B', '777777', 'CCCCCC'],
autosuggestion: '777777', autosuggestion: '777777',
command: '00FF00', command: '00FF00',
comment: '30BE30', comment: '30BE30',
@@ -435,9 +435,9 @@ var additional_color_schemes = [
{ {
'name': 'Just a Touch', 'name': 'Just a Touch',
'preferred_background': 'black', 'preferred_background': 'black',
colors: ['B0B0B0', '969696', '789276', 'F4F4F4', 'A0A0F0', '666A80', 'F0F0F0', 'D7D7D7', 'B7B7B7', 'FFA779', 'FAFAFA'], colors: ['B0B0B0', '969696', '789276', 'F4F4F4', 'A0A0F0', '666A80', 'F0F0F0', 'D7D7D7', 'B7B7B7', 'FFA779', 'FAFAFA'],
autosuggestion: '9C9C9C', autosuggestion: '9C9C9C',
command: 'F4F4F4', command: 'F4F4F4',
comment: 'B0B0B0', comment: 'B0B0B0',

View File

@@ -22,7 +22,7 @@ controllers.controller("colorsController", function($scope, $http) {
$scope.colorArraysArray = $scope.getColorArraysArray(); $scope.colorArraysArray = $scope.getColorArraysArray();
//TODO: Save button should be shown only when colors are changed //TODO: Save button should be shown only when colors are changed
$scope.showSaveButton = true; $scope.showSaveButton = true;
$scope.noteThemeChanged(); $scope.noteThemeChanged();
} }
@@ -31,7 +31,7 @@ controllers.controller("colorsController", function($scope, $http) {
} }
$scope.text_color_for_color = text_color_for_color; $scope.text_color_for_color = text_color_for_color;
$scope.border_color_for_color = border_color_for_color; $scope.border_color_for_color = border_color_for_color;
$scope.getColorArraysArray = function() { $scope.getColorArraysArray = function() {
@@ -42,7 +42,7 @@ controllers.controller("colorsController", function($scope, $http) {
result = get_colors_as_nested_array(term_256_colors, 32); result = get_colors_as_nested_array(term_256_colors, 32);
return result; return result;
} }
$scope.beginCustomizationWithSetting = function(setting) { $scope.beginCustomizationWithSetting = function(setting) {
if (! $scope.customizationActive) { if (! $scope.customizationActive) {
$scope.customizationActive = true; $scope.customizationActive = true;
@@ -51,14 +51,14 @@ controllers.controller("colorsController", function($scope, $http) {
$scope.csUserVisibleTitle = user_visible_title_for_setting_name(setting); $scope.csUserVisibleTitle = user_visible_title_for_setting_name(setting);
} }
} }
$scope.selectColorSetting = function(name) { $scope.selectColorSetting = function(name) {
$scope.selectedColorSetting = name; $scope.selectedColorSetting = name;
$scope.csEditingType = $scope.customizationActive ? name : ''; $scope.csEditingType = $scope.customizationActive ? name : '';
$scope.csUserVisibleTitle = user_visible_title_for_setting_name(name); $scope.csUserVisibleTitle = user_visible_title_for_setting_name(name);
$scope.beginCustomizationWithSetting(name); $scope.beginCustomizationWithSetting(name);
} }
$scope.toggleCustomizationActive = function() { $scope.toggleCustomizationActive = function() {
if (! $scope.customizationActive) { if (! $scope.customizationActive) {
$scope.beginCustomizationWithSetting($scope.selectedColorSetting || 'command'); $scope.beginCustomizationWithSetting($scope.selectedColorSetting || 'command');
@@ -93,7 +93,7 @@ controllers.controller("colorsController", function($scope, $http) {
})}; })};
$scope.saveThemeButtonTitle = "Set Theme"; $scope.saveThemeButtonTitle = "Set Theme";
$scope.noteThemeChanged = function() { $scope.noteThemeChanged = function() {
$scope.saveThemeButtonTitle = "Set Theme"; $scope.saveThemeButtonTitle = "Set Theme";
} }
@@ -135,7 +135,7 @@ controllers.controller("promptController", function($scope, $http) {
$scope.selectPrompt = function(prompt) { $scope.selectPrompt = function(prompt) {
$scope.selectedPrompt= prompt; $scope.selectedPrompt= prompt;
$scope.savePromptButtonTitle = "Set Prompt"; $scope.savePromptButtonTitle = "Set Prompt";
} }
@@ -163,7 +163,7 @@ controllers.controller("promptController", function($scope, $http) {
controllers.controller("functionsController", function($scope, $http) { controllers.controller("functionsController", function($scope, $http) {
$scope.selectedFunction = null; $scope.selectedFunction = null;
$scope.functionDefinition = ""; $scope.functionDefinition = "";
$scope.selectFunction = function(fun) { $scope.selectFunction = function(fun) {
$scope.selectedFunction = fun; $scope.selectedFunction = fun;