summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Compose/src/en_US.UTF-8 (renamed from Compose/contrib/en_US.UTF-8)0
-rw-r--r--linux/bin/installiere_neo/installiere_neo.18
-rw-r--r--windows/neo-vars/src/source/compose-gen.ahk4
3 files changed, 6 insertions, 6 deletions
diff --git a/Compose/contrib/en_US.UTF-8 b/Compose/src/en_US.UTF-8
index c4bee1c..c4bee1c 100644
--- a/Compose/contrib/en_US.UTF-8
+++ b/Compose/src/en_US.UTF-8
diff --git a/linux/bin/installiere_neo/installiere_neo.1 b/linux/bin/installiere_neo/installiere_neo.1
index 472b07f..a5082a7 100644
--- a/linux/bin/installiere_neo/installiere_neo.1
+++ b/linux/bin/installiere_neo/installiere_neo.1
@@ -167,19 +167,19 @@ install_options()
chmod u+x $inst_dir/beschreibe
echo "Ergänze die Compose-Erweiterung von Neo…"
- create neo_compose $inst_dir/Compose.neo
+ create neo_compose $inst_dir/XCompose
if [ -f $HOME/.XCompose ]
then
echo -e "Die Datei ${red}$HOME/.XCompose${normal} gibt es bereits – soll die bestehende Datei überschrieben werden? \c"; read -p "[J,N] " -e overwrite
if [ "$overwrite" = "J" ] # overwrite?
then
echo "Datei $HOME/.XCompose wird überschrieben!"
- cat /usr/share/X11/locale/en_US.UTF-8/Compose $inst_dir/Compose.neo > $HOME/.XCompose
+ cat /usr/share/X11/locale/en_US.UTF-8/Compose $inst_dir/XCompose > $HOME/.XCompose
else
echo -e "Datei ${red}$HOME/.XCompose${normal} bleibt erhalten, jedoch kann die Compos-Erweiterung von Neo nicht genutzt werden."
fi
else
- cat /usr/share/X11/locale/en_US.UTF-8/Compose $inst_dir/Compose.neo > $HOME/.XCompose
+ cat /usr/share/X11/locale/en_US.UTF-8/Compose $inst_dir/XCompose > $HOME/.XCompose
fi
create neorc $HOME/.neorc
@@ -217,7 +217,7 @@ deinstall()
rmfromprofile
remove $HOME/.neorc
remove $inst_dir/starte_neo
- remove $inst_dir/Compose.neo
+ remove $inst_dir/XCompose
remove $inst_dir/neo20.txt
remove $inst_dir/beschreibe
remove $inst_dir/wiemitneo
diff --git a/windows/neo-vars/src/source/compose-gen.ahk b/windows/neo-vars/src/source/compose-gen.ahk
index 4942d2f..f6dae55 100644
--- a/windows/neo-vars/src/source/compose-gen.ahk
+++ b/windows/neo-vars/src/source/compose-gen.ahk
@@ -1916,9 +1916,9 @@ LoadCurrentCompose() {
return
ConvertCompose:
- ComposePath := "..\..\..\Compose"
+ ComposePath := "..\..\..\Compose\src"
LoadCurrentComposeFile(ComposePath . "\en_US.UTF-8")
- LoadCurrentComposeFile(ComposePath . "\Compose.neo")
+ LoadCurrentComposeFile(ComposePath . "\base.module")
TrayTip,Compose-Konvertierung,Konvertierung abgeschlossen!,10,1
return
}