[geany/geany] e513e5: Move filetypes.* to the filedefs directory
Jiří Techet
git-noreply at xxxxx
Sun Mar 13 16:35:08 UTC 2016
Branch: refs/heads/master
Author: Jiří Techet <techet at gmail.com>
Committer: Jiří Techet <techet at gmail.com>
Date: Sun, 13 Mar 2016 16:35:08 UTC
Commit: e513e5a099db21cfb518483b459d433d509c948c
https://github.com/geany/geany/commit/e513e5a099db21cfb518483b459d433d509c948c
Log Message:
-----------
Move filetypes.* to the filedefs directory
Modified Paths:
--------------
data/Makefile.am
data/filedefs/filetypes.CUDA.conf
data/filedefs/filetypes.Clojure.conf
data/filedefs/filetypes.Cython.conf
data/filedefs/filetypes.Genie.conf
data/filedefs/filetypes.Graphviz.conf
data/filedefs/filetypes.JSON.conf
data/filedefs/filetypes.Scala.conf
data/filedefs/filetypes.abaqus
data/filedefs/filetypes.abc
data/filedefs/filetypes.actionscript
data/filedefs/filetypes.ada
data/filedefs/filetypes.asciidoc
data/filedefs/filetypes.asm
data/filedefs/filetypes.batch
data/filedefs/filetypes.c
data/filedefs/filetypes.caml
data/filedefs/filetypes.cmake
data/filedefs/filetypes.cobol
data/filedefs/filetypes.coffeescript
data/filedefs/filetypes.common
data/filedefs/filetypes.conf
data/filedefs/filetypes.cpp
data/filedefs/filetypes.cs
data/filedefs/filetypes.css
data/filedefs/filetypes.d
data/filedefs/filetypes.diff
data/filedefs/filetypes.docbook
data/filedefs/filetypes.erlang
data/filedefs/filetypes.f77
data/filedefs/filetypes.ferite
data/filedefs/filetypes.forth
data/filedefs/filetypes.fortran
data/filedefs/filetypes.freebasic
data/filedefs/filetypes.glsl
data/filedefs/filetypes.go
data/filedefs/filetypes.haskell
data/filedefs/filetypes.haxe
data/filedefs/filetypes.html
data/filedefs/filetypes.java
data/filedefs/filetypes.javascript
data/filedefs/filetypes.latex
data/filedefs/filetypes.lisp
data/filedefs/filetypes.lua
data/filedefs/filetypes.makefile
data/filedefs/filetypes.markdown
data/filedefs/filetypes.matlab
data/filedefs/filetypes.nsis
data/filedefs/filetypes.objectivec
data/filedefs/filetypes.pascal
data/filedefs/filetypes.perl
data/filedefs/filetypes.php
data/filedefs/filetypes.po
data/filedefs/filetypes.powershell
data/filedefs/filetypes.python
data/filedefs/filetypes.r
data/filedefs/filetypes.restructuredtext
data/filedefs/filetypes.ruby
data/filedefs/filetypes.rust
data/filedefs/filetypes.sh
data/filedefs/filetypes.sql
data/filedefs/filetypes.tcl
data/filedefs/filetypes.txt2tags
data/filedefs/filetypes.vala
data/filedefs/filetypes.verilog
data/filedefs/filetypes.vhdl
data/filedefs/filetypes.xml
data/filedefs/filetypes.yaml
data/filedefs/filetypes.zephir
src/filetypes.c
src/libmain.c
tests/ctags/runner.sh
Modified: data/Makefile.am
136 lines changed, 68 insertions(+), 68 deletions(-)
===================================================================
@@ -3,74 +3,74 @@ colorschemes = \
colorschemes/alt.conf
filetypes = \
- filetypes.abaqus \
- filetypes.abc \
- filetypes.actionscript \
- filetypes.ada \
- filetypes.asciidoc \
- filetypes.asm \
- filetypes.batch \
- filetypes.c \
- filetypes.caml \
- filetypes.Clojure.conf \
- filetypes.cmake \
- filetypes.cobol \
- filetypes.coffeescript \
- filetypes.common \
- filetypes.conf \
- filetypes.cpp \
- filetypes.cs \
- filetypes.css \
- filetypes.CUDA.conf \
- filetypes.Cython.conf \
- filetypes.d \
- filetypes.diff \
- filetypes.docbook \
- filetypes.erlang \
- filetypes.f77 \
- filetypes.ferite \
- filetypes.forth \
- filetypes.fortran \
- filetypes.freebasic \
- filetypes.Genie.conf \
- filetypes.glsl \
- filetypes.go \
- filetypes.Graphviz.conf \
- filetypes.haskell \
- filetypes.haxe \
- filetypes.html \
- filetypes.java \
- filetypes.javascript \
- filetypes.JSON.conf \
- filetypes.latex \
- filetypes.lisp \
- filetypes.lua \
- filetypes.makefile \
- filetypes.markdown \
- filetypes.matlab \
- filetypes.nsis \
- filetypes.objectivec \
- filetypes.pascal \
- filetypes.perl \
- filetypes.php \
- filetypes.po \
- filetypes.powershell \
- filetypes.python \
- filetypes.r \
- filetypes.restructuredtext \
- filetypes.ruby \
- filetypes.rust \
- filetypes.Scala.conf \
- filetypes.sh \
- filetypes.sql \
- filetypes.tcl \
- filetypes.txt2tags \
- filetypes.vala \
- filetypes.verilog \
- filetypes.vhdl \
- filetypes.xml \
- filetypes.yaml \
- filetypes.zephir
+ filedefs/filetypes.abaqus \
+ filedefs/filetypes.abc \
+ filedefs/filetypes.actionscript \
+ filedefs/filetypes.ada \
+ filedefs/filetypes.asciidoc \
+ filedefs/filetypes.asm \
+ filedefs/filetypes.batch \
+ filedefs/filetypes.c \
+ filedefs/filetypes.caml \
+ filedefs/filetypes.Clojure.conf \
+ filedefs/filetypes.cmake \
+ filedefs/filetypes.cobol \
+ filedefs/filetypes.coffeescript \
+ filedefs/filetypes.common \
+ filedefs/filetypes.conf \
+ filedefs/filetypes.cpp \
+ filedefs/filetypes.cs \
+ filedefs/filetypes.css \
+ filedefs/filetypes.CUDA.conf \
+ filedefs/filetypes.Cython.conf \
+ filedefs/filetypes.d \
+ filedefs/filetypes.diff \
+ filedefs/filetypes.docbook \
+ filedefs/filetypes.erlang \
+ filedefs/filetypes.f77 \
+ filedefs/filetypes.ferite \
+ filedefs/filetypes.forth \
+ filedefs/filetypes.fortran \
+ filedefs/filetypes.freebasic \
+ filedefs/filetypes.Genie.conf \
+ filedefs/filetypes.glsl \
+ filedefs/filetypes.go \
+ filedefs/filetypes.Graphviz.conf \
+ filedefs/filetypes.haskell \
+ filedefs/filetypes.haxe \
+ filedefs/filetypes.html \
+ filedefs/filetypes.java \
+ filedefs/filetypes.javascript \
+ filedefs/filetypes.JSON.conf \
+ filedefs/filetypes.latex \
+ filedefs/filetypes.lisp \
+ filedefs/filetypes.lua \
+ filedefs/filetypes.makefile \
+ filedefs/filetypes.markdown \
+ filedefs/filetypes.matlab \
+ filedefs/filetypes.nsis \
+ filedefs/filetypes.objectivec \
+ filedefs/filetypes.pascal \
+ filedefs/filetypes.perl \
+ filedefs/filetypes.php \
+ filedefs/filetypes.po \
+ filedefs/filetypes.powershell \
+ filedefs/filetypes.python \
+ filedefs/filetypes.r \
+ filedefs/filetypes.restructuredtext \
+ filedefs/filetypes.ruby \
+ filedefs/filetypes.rust \
+ filedefs/filetypes.Scala.conf \
+ filedefs/filetypes.sh \
+ filedefs/filetypes.sql \
+ filedefs/filetypes.tcl \
+ filedefs/filetypes.txt2tags \
+ filedefs/filetypes.vala \
+ filedefs/filetypes.verilog \
+ filedefs/filetypes.vhdl \
+ filedefs/filetypes.xml \
+ filedefs/filetypes.yaml \
+ filedefs/filetypes.zephir
tagfiles = \
c99.tags \
Modified: data/filedefs/filetypes.CUDA.conf
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.Clojure.conf
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.Cython.conf
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.Genie.conf
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.Graphviz.conf
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.JSON.conf
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.Scala.conf
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.abaqus
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.abc
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.actionscript
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.ada
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.asciidoc
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.asm
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.batch
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.caml
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.cmake
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.cobol
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.coffeescript
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.common
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.conf
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.cpp
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.cs
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.css
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.d
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.diff
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.docbook
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.erlang
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.f77
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.ferite
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.forth
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.fortran
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.freebasic
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.glsl
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.go
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.haskell
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.haxe
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.html
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.java
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.javascript
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.latex
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.lisp
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.lua
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.makefile
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.markdown
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.matlab
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.nsis
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.objectivec
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.pascal
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.perl
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.php
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.po
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.powershell
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.python
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.r
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.restructuredtext
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.ruby
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.rust
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.sh
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.sql
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.tcl
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.txt2tags
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.vala
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.verilog
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.vhdl
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.xml
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.yaml
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: data/filedefs/filetypes.zephir
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: src/filetypes.c
8 lines changed, 5 insertions(+), 3 deletions(-)
===================================================================
@@ -346,7 +346,9 @@ void filetypes_init_types(void)
{
filetype_add(filetypes[ft_id]);
}
- init_custom_filetypes(app->datadir);
+ f = g_build_filename(app->datadir, GEANY_FILEDEFS_SUBDIR, NULL);
+ init_custom_filetypes(f);
+ g_free(f);
f = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL);
init_custom_filetypes(f);
g_free(f);
@@ -536,7 +538,7 @@ static GeanyFiletype *check_builtin_filenames(const gchar *utf8_filename)
if (g_str_has_prefix(lfn, path))
found = TRUE;
- SETPTR(path, g_build_filename(app->datadir, "filetypes.", NULL));
+ SETPTR(path, g_build_filename(app->datadir, GEANY_FILEDEFS_SUBDIR, "filetypes.", NULL));
if (g_str_has_prefix(lfn, path))
found = TRUE;
@@ -1012,7 +1014,7 @@ static gchar *filetypes_get_filename(GeanyFiletype *ft, gboolean user)
if (user)
file_name = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, base_name, NULL);
else
- file_name = g_build_filename(app->datadir, base_name, NULL);
+ file_name = g_build_filename(app->datadir, GEANY_FILEDEFS_SUBDIR, base_name, NULL);
g_free(ext);
g_free(base_name);
Modified: src/libmain.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -704,7 +704,7 @@ static gint create_config_dir(void)
if (saved_errno == 0 && ! g_file_test(filedefs_readme, G_FILE_TEST_EXISTS))
{
gchar *text = g_strconcat(
-"Copy files from ", app->datadir, " to this directory to overwrite "
+"Copy files from ", app->datadir, "/filedefs to this directory to overwrite "
"them. To use the defaults, just delete the file in this directory.\nFor more information read "
"the documentation (in ", app->docdir, G_DIR_SEPARATOR_S "index.html or visit " GEANY_HOMEPAGE ").", NULL);
utils_write_file(filedefs_readme, text);
Modified: tests/ctags/runner.sh
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -15,7 +15,7 @@ trap 'rm -rf "$TMPDIR"' EXIT
mkdir -p "$CONFDIR" || exit 99
mkdir -p "$CONFDIR/filedefs/" || exit 99
cp "${srcdir:-.}"/../../data/filetype_extensions.conf "$CONFDIR" || exit 99
-cp "${srcdir:-.}"/../../data/filetypes.* "$CONFDIR/filedefs/" || exit 99
+cp "${srcdir:-.}"/../../data/filedefs/filetypes.* "$CONFDIR/filedefs/" || exit 99
result="$1"
source="${result%.*}"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list