Drop use of the N_ no-op for translation descriptions. Instead, tell xgettext that any token following '--description' should be translated. This should greatly speed up completion loading on platforms where fork() is slow. (Hi, OS X)

darcs-hash:20070116011828-ac50b-fb923dc877869ded4d506bbe0bc5364eea44092f.gz

1 files changed, 59 insertions, 55 deletions

diff --git a/share/completions/gcc.fish b/share/completions/gcc.fish
index 8f8a55dc..ea3aeae9 100644
--- a/share/completions/gcc.fish
+++ b/share/completions/gcc.fish
@@ -2,7 +2,7 @@
 # The gcc completion list is incomplete. There are just so many of them...
 #
 
-complete -c gcc -s x -d (N_ "Language") -x -a '
+complete -c gcc -s x --description "Language" -x -a '
 	c
 	c-header
 	cpp-output
@@ -20,16 +20,16 @@ complete -c gcc -s x -d (N_ "Language") -x -a '
 	treelang
 	none
 '
-complete -c gcc -o pass-exit-codes -d (N_ "Pass program exit codes")
-complete -c gcc -s c -d (N_ "Stop after assembler")
-complete -c gcc -s S -d (N_ "Stop after compile")
-complete -c gcc -s E -d (N_ "Stop after preprocessor")
-complete -c gcc -s o -r -d (N_ "Output file")
-complete -c gcc -s v -d (N_ "Print commands to stderr")
-complete -c gcc -o \#\#\# -d (N_ "Print quoted commands to stderr, do not run")
-complete -c gcc -o pipe -d (N_ "Use pipes")
-complete -c gcc -o ansi -d (N_ "Use ansi mode")
-complete -c gcc -o std -d (N_ "Standard mode") -x -a '
+complete -c gcc -o pass-exit-codes --description "Pass program exit codes"
+complete -c gcc -s c --description "Stop after assembler"
+complete -c gcc -s S --description "Stop after compile"
+complete -c gcc -s E --description "Stop after preprocessor"
+complete -c gcc -s o -r --description "Output file"
+complete -c gcc -s v --description "Print commands to stderr"
+complete -c gcc -o \#\#\# --description "Print quoted commands to stderr, do not run"
+complete -c gcc -o pipe --description "Use pipes"
+complete -c gcc -o ansi --description "Use ansi mode"
+complete -c gcc -o std --description "Standard mode" -x -a '
 	c89\t"ISO C90"
 	iso9899:1990\t"ISO C90"
 	iso9899:199409\t"ISO C90 as modified in amendment 1"
@@ -43,54 +43,58 @@ complete -c gcc -o std -d (N_ "Standard mode") -x -a '
 	c++98\t"ISO C++98"
 	gnu++98\t"ISO C++98 plus GNU extentions"
 '
-complete -c gcc -o aux-info -r -d (N_ "Write prototypes to file")
-complete -c gcc -o fno-asm -d (N_ "Do not recognize asm, inline or typeof keywords")
-complete -c gcc -o fno-builtin -d (N_ "Do not use builtin functions")
-complete -c gcc -o fhosted -d (N_ "Assert hosted environment")
-complete -c gcc -o ffreestanding -d (N_ "Assert freestanding environment")
-complete -c gcc -o fms-extensions -d (N_ "Use Microsoft extensions")
-complete -c gcc -o trigraphs -d (N_ "Use ANSI trigraphs")
-complete -c gcc -o no-integrated-cpp -d (N_ "Do not use integrated preprocessor")
-complete -c gcc -o funsigned-char -d (N_ "char is unsigned")
-complete -c gcc -o fsigned-char -d (N_ "char is signed")
-complete -c gcc -o funsigned-bitfields -d (N_ "bitfield is unsigned")
-complete -c gcc -o fsigned-bitfields -d (N_ "bitfield is signed")
-complete -c gcc -o fno-unsigned-bitfields -d (N_ "All bitfields are signed")
-complete -c gcc -o fno-signed-bitfields -d (N_ "All bitfields are unsigned")
-complete -c gcc -o fwritable-strings -d (N_ "String constants are not const")
-complete -c gcc -o fabi-version -d (N_ "C++ ABI version") -r -x -a '1 0'
-complete -c gcc -o fno-access-control -d (N_ "Turn off access checking")
-complete -c gcc -o fcheck-new -d (N_ "Check pointer returned by new")
-complete -c gcc -o fconserve-space -d (N_ "Put globals in the common segment")
-complete -c gcc -o fno-const-strings -d (N_ "String constants are not const")
-complete -c gcc -o fdollars-in-identifiers -d (N_ "Accept \$ in identifiers")
-complete -c gcc -o fno-dollars-in-identifiers -d (N_ "Reject \$ in identifiers")
-complete -c gcc -o fno-elide-constructors -d (N_ "Do not omit unneeded temporarys")
-complete -c gcc -o fno-enforce-eh-specs -d (N_ "Allow exception violations")
-complete -c gcc -o ffor-scope -d (N_ "Do not extend for-loop scope")
-complete -c gcc -o fno-for-scope -d (N_ "Extend for-loop scope")
-complete -c gcc -o fno-gnu-keywords -d (N_ "Do not recognize typeof as keyword")
-complete -c gcc -o fno-implicit-templates -d (N_ "Do not emit code for implicit templates")
-complete -c gcc -o fno-implicit-inline-templates -d (N_ "Do not emit code for implicit inline templates")
-complete -c gcc -o fno-implement-inlines -d (N_ "Do not emit out-of-line code for inline functions")
-complete -c gcc -o fms-extensions -d (N_ "Disable warnings about MFC")
-complete -c gcc -o fno-nonansi-builtins -d (N_ "Disable some built-in functions")
-complete -c gcc -o fno-operator-names -d (N_ "Disable operator keywords")
-complete -c gcc -o fno-optional-diags -d (N_ "Disable optional diagnostics")
-complete -c gcc -o fpermissive -d (N_ "Downgrade some errors to warnings")
-complete -c gcc -o frepo -d (N_ "Enable automatic template instantiation at link time")
-complete -c gcc -o fno-rtti -d (N_ "Disable generation of C++ runtime type information")
-#complete -c gcc -o fstats -d (N_ "Emit front-end usage statistics")
+complete -c gcc -o aux-info -r --description "Write prototypes to file"
+complete -c gcc -o fno-asm --description "Do not recognize asm, inline or typeof keywords"
+complete -c gcc -o fno-builtin --description "Do not use builtin functions"
+complete -c gcc -o fhosted --description "Assert hosted environment"
+complete -c gcc -o ffreestanding --description "Assert freestanding environment"
+complete -c gcc -o fms-extensions --description "Use Microsoft extensions"
+complete -c gcc -o trigraphs --description "Use ANSI trigraphs"
+complete -c gcc -o no-integrated-cpp --description "Do not use integrated preprocessor"
+complete -c gcc -o funsigned-char --description "char is unsigned"
+complete -c gcc -o fsigned-char --description "char is signed"
+complete -c gcc -o funsigned-bitfields --description "bitfield is unsigned"
+complete -c gcc -o fsigned-bitfields --description "bitfield is signed"
+complete -c gcc -o fno-unsigned-bitfields --description "All bitfields are signed"
+complete -c gcc -o fno-signed-bitfields --description "All bitfields are unsigned"
+complete -c gcc -o fwritable-strings --description "String constants are not const"
+complete -c gcc -o fabi-version --description "C++ ABI version" -r -x -a '1 0'
+complete -c gcc -o fno-access-control --description "Turn off access checking"
+complete -c gcc -o fcheck-new --description "Check pointer returned by new"
+complete -c gcc -o fconserve-space --description "Put globals in the common segment"
+complete -c gcc -o fno-const-strings --description "String constants are not const"
+complete -c gcc -o fdollars-in-identifiers --description "Accept \$ in identifiers"
+complete -c gcc -o fno-dollars-in-identifiers --description "Reject \$ in identifiers"
+complete -c gcc -o fno-elide-constructors --description "Do not omit unneeded temporarys"
+complete -c gcc -o fno-enforce-eh-specs --description "Allow exception violations"
+complete -c gcc -o ffor-scope --description "Do not extend for-loop scope"
+complete -c gcc -o fno-for-scope --description "Extend for-loop scope"
+complete -c gcc -o fno-gnu-keywords --description "Do not recognize typeof as keyword"
+complete -c gcc -o fno-implicit-templates --description "Do not emit code for implicit templates"
+complete -c gcc -o fno-implicit-inline-templates --description "Do not emit code for implicit inline templates"
+complete -c gcc -o fno-implement-inlines --description "Do not emit out-of-line code for inline functions"
+complete -c gcc -o fms-extensions --description "Disable warnings about MFC"
+complete -c gcc -o fno-nonansi-builtins --description "Disable some built-in functions"
+complete -c gcc -o fno-operator-names --description "Disable operator keywords"
+complete -c gcc -o fno-optional-diags --description "Disable optional diagnostics"
+complete -c gcc -o fpermissive --description "Downgrade some errors to warnings"
+complete -c gcc -o frepo --description "Enable automatic template instantiation at link time"
+complete -c gcc -o fno-rtti --description "Disable generation of C++ runtime type information"
+#complete -c gcc -o fstats --description "Emit front-end usage statistics"
 
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;
-	complete -c gcc -o ftemplate-depth-1 -d (N_ "Set maximum template depth")
+	complete -c gcc -o ftemplate-depth-1 --description "Set maximum template depth"
 end;
 
-complete -c gcc -o fno-threadsafe-statistics -d (N_ "Do not emit code for thread-safe initialization of local statics")
-complete -c gcc -o fuse-cxa-atexit -d (N_ "Use __cxa_atexit for destructors")
-complete -c gcc -o fvisibility-inlines-hidden -d (N_ "Hides inline methods from export table")
-complete -c gcc -o fno-weak -d (N_ "Do not use weak symbol support")
+complete -c gcc -o fno-threadsafe-statistics --description "Do not emit code for thread-safe initialization of local statics"
+complete -c gcc -o fuse-cxa-atexit --description "Use __cxa_atexit for destructors"
+complete -c gcc -o fvisibility-inlines-hidden --description "Hides inline methods from export table"
+complete -c gcc -o fno-weak --description "Do not use weak symbol support"
+
+complete -c gcc -l help --description "Display help and exit"
+complete -c gcc -l version --description "Display version and exit"
+
 # gcc completion listing is incomplete.
-#complete -c gcc -o -d (N_ "")
+#complete -c gcc -o --description ""