Commits November 2015

commits@lists.geany.org

1 participants
77 discussions

[geany/geany] e2ab39: Merge pull request #743 from andrej-herceg/sk-po
by Frank Lanitz 09 Nov '15

09 Nov '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 09 Nov 2015 22:26:40 UTC Commit: e2ab39006f1bbc9d74a87c4c9de997ea1f458eb4 https://github.com/geany/geany/commit/e2ab39006f1bbc9d74a87c4c9de997ea1f458… Log Message: ----------- Merge pull request #743 from andrej-herceg/sk-po Update of Slovak translation Modified Paths: -------------- po/sk.po Modified: po/sk.po 1510 lines changed, 730 insertions(+), 780 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 101903: Update of Slovak translation
by Andrej Herceg 09 Nov '15

09 Nov '15

Branch: refs/heads/master Author: Andrej Herceg <chrono.i18n(a)gmail.com> Committer: Andrej Herceg <chrono.i18n(a)gmail.com> Date: Mon, 09 Nov 2015 14:58:11 UTC Commit: 101903ebab811f299d848a8bdfd10c21948dec9e https://github.com/geany/geany/commit/101903ebab811f299d848a8bdfd10c21948de… Log Message: ----------- Update of Slovak translation Modified Paths: -------------- po/sk.po Modified: po/sk.po 1510 lines changed, 730 insertions(+), 780 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7844ec: Update NEWS
by Colomban Wendling 09 Nov '15

09 Nov '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 09 Nov 2015 12:48:24 UTC Commit: 7844ecc61dfad142576ef21cb1e5b14d6c42932d https://github.com/geany/geany/commit/7844ecc61dfad142576ef21cb1e5b14d6c429… Log Message: ----------- Update NEWS Modified Paths: -------------- NEWS Modified: NEWS 51 lines changed, 51 insertions(+), 0 deletions(-) =================================================================== @@ -1,7 +1,58 @@ Geany 1.26 (unreleased) + General + * New plugin API (Thomas Martitz, PR#469). + * Add support for "proxy" plugins (Thomas Martitz, PR#629). + + Bug fixes + * Fix "Open in New Window" command (Issue#590). + * Fix spurious "source file has been modified" (Jiří Techet, Issue#605, + PR#621). + * Don't open more than one document for non-existing paths from the CLI + (https://bugs.launchpad.net/linuxmint/+bug/1482558, PR#646). + * Fix configuration directory encoding on non-UTF-8 non-Windows systems + (Dimitar Zhekov, PR#658). + + Interface + * Use monospace font for the message window by default (Jiří Techet, + Issue#435, PR#580). + * Fix mnemonic conflict in "Use multi-line matching" (Ross Konsolebox, + Issue#589, PR#647). + + Editor + * Update Scintilla to version 3.6.1. + * Keeping undo history when reloading files is now enabled by default + (Thomas Martitz, Issue#562, PR#672). + * "Strip trailing spaces", "Replace tabs" and "Replace spaces" now + follow the current selection (Pavel Sountsov, PR#394). + * Respect Smart Home Key setting in Go To Start of Display Line. + * Check whether the document is newer on disk when the window gets + focused (Jiří Techet, PR#533). + + Filetypes + * Add Cargo build commands for Rust (Wayne Nilsen, PR#557). + * Add recent Perl keywords (Olivier Duclos, PR#599). + * Improvements to the Rust filetype (Pavel Sountsov, PR#613). + * Add multiline comment to Haskell (Abel Serrano Juste, PR#638). + * Recognize `.adoc` is as Asciidoc (PR#708, PR#711). + * Recognize `.mml` and `.mathml` as XML (Devyn Collier Johnson, PR#731). + Internationalization * Updated translations: de, el, es, fr, kk, pt, sv, ru + * Fix internationalization of "Open in New Window" items. + + API + * New plugin API, `geany_load_module()`, `geany_plugin_register()`, + `GEANY_PLUGIN_REGISTER()`, `geany_plugin_register_full()`, + `GEANY_PLUGIN_REGISTER_FULL()` (Thomas Martitz, PR#469). + * Add support for "proxy" plugins, `geany_plugin_register_proxy()` + (Thomas Martitz, PR#629). + * Allow `user_data` parameter and `destroy_notify` callback to + keybindings with new `keybindings_set_item_full()` and + `plugin_set_key_group_full()` (Thomas Martitz, PR#376). + + Windows + * Restore modern design of native file dialogs (Issue#578). Geany 1.25 (July 12, 2015) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1ce1b6: Merge pull request #740 from samsulmaarif/master
by Frank Lanitz 09 Nov '15

09 Nov '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 09 Nov 2015 07:20:45 UTC Commit: 1ce1b600d4a56153c31b6b10ee9909d188a711e8 https://github.com/geany/geany/commit/1ce1b600d4a56153c31b6b10ee9909d188a71… Log Message: ----------- Merge pull request #740 from samsulmaarif/master Indonesian translation update Modified Paths: -------------- po/id.po Modified: po/id.po 567 lines changed, 280 insertions(+), 287 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7b5e9a: Add a deprecation notice when using the Waf build system
by Enrico Tröger 08 Nov '15

08 Nov '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 08 Nov 2015 22:46:49 UTC Commit: 7b5e9a93cb99fe601a75bb36eddf7db84eb84611 https://github.com/geany/geany/commit/7b5e9a93cb99fe601a75bb36eddf7db84eb84… Log Message: ----------- Add a deprecation notice when using the Waf build system As Waf is to be dropped after the 1.26 release, inform the user to better use the Autotools build system. Modified Paths: -------------- wscript Modified: wscript 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -349,6 +349,15 @@ but you then may not have a local copy of the HTML manual.''' conf.msg('Use virtual terminal support', conf.options.no_vte and 'no' or 'yes') if revision is not None: conf.msg('Compiling Git revision', revision) + # deprecation warning + _show_deprecation_warning(conf) + + +def _show_deprecation_warning(ctx): + Logs.pprint( + 'RED', + 'The Waf build system is deprecated and will be removed in the removed in Geany 1.27. ' + 'Please use the Autotools build system.') def options(opt): @@ -393,6 +402,7 @@ def options(opt): def build(bld): is_win32 = _target_is_win32(bld) + bld.add_post_fun(_show_deprecation_warning) if bld.cmd == 'clean': _remove_linguas_file() -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 44a4c8: Indonesian Translation update
by Samsul Ma'arif 08 Nov '15

08 Nov '15

Branch: refs/heads/master Author: Samsul Ma'arif <admin(a)samsul.web.id> Committer: Samsul Ma'arif <admin(a)samsul.web.id> Date: Sun, 08 Nov 2015 15:33:53 UTC Commit: 44a4c8024d3ef89905e15d50b8602f03753f757b https://github.com/geany/geany/commit/44a4c8024d3ef89905e15d50b8602f03753f7… Log Message: ----------- Indonesian Translation update Signed-off-by: Samsul Ma'arif <mail(a)samsul.web.id> Modified Paths: -------------- po/id.po Modified: po/id.po 567 lines changed, 280 insertions(+), 287 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a42230: Small update of NEWS
by Frank Lanitz 08 Nov '15

08 Nov '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 08 Nov 2015 12:58:02 UTC Commit: a42230539c8a33b0b7b3484b3041b17fe6b1f70d https://github.com/geany/geany/commit/a42230539c8a33b0b7b3484b3041b17fe6b1f… Log Message: ----------- Small update of NEWS Modified Paths: -------------- NEWS Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ Geany 1.26 (unreleased) Internationalization - * Updated translations: de, el, es, fr, kk, pt, sv + * Updated translations: de, el, es, fr, kk, pt, sv, ru Geany 1.25 (July 12, 2015) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ee2809: Merge pull request #1 from geany/master
by Samsul Ma'arif 08 Nov '15

08 Nov '15

Branch: refs/heads/master Author: Samsul Ma'arif <admin(a)samsul.web.id> Committer: Samsul Ma'arif <admin(a)samsul.web.id> Date: Sun, 08 Nov 2015 11:02:25 UTC Commit: ee2809f92a4adb4d314f73eb3cb43303ad0d59fd https://github.com/geany/geany/commit/ee2809f92a4adb4d314f73eb3cb43303ad0d5… Log Message: ----------- Merge pull request #1 from geany/master Update from geany/geany Modified Paths: -------------- .gitignore .travis.yml HACKING Makefile.am NEWS README README.Packagers THANKS configure.ac data/Makefile.am data/c99.tags data/filetype_extensions.conf data/filetypes.JSON.conf data/filetypes.c data/filetypes.coffeescript data/filetypes.common data/filetypes.cpp data/filetypes.css data/filetypes.freebasic data/filetypes.go data/filetypes.haskell data/filetypes.html data/filetypes.javascript data/filetypes.lua data/filetypes.objectivec data/filetypes.perl data/filetypes.python data/filetypes.r data/filetypes.ruby data/filetypes.rust data/filetypes.sh data/filetypes.sql data/filetypes.verilog data/filetypes.vhdl data/filetypes.xml data/filetypes.zephir data/geany.css data/geany.glade data/geany.gtkrc doc/Doxyfile.in doc/Makefile.am doc/geany.1.in doc/geany.html doc/geany.txt doc/makefile.win32 doc/making-a-release doc/plugins.dox doc/pluginsignals.c doc/pluginsymbols.c geany.desktop.in geany.exe.manifest geany.nsi.in geany.pc.in geany.spec.in geany_private.rc icons/16x16/geany.png icons/32x32/Makefile.am icons/32x32/geany.png icons/48x48/geany.png icons/geany.ico icons/scalable/geany.svg m4/geany-binreloc.m4 m4/geany-docutils.m4 m4/geany-doxygen.m4 m4/geany-i18n.m4 m4/geany-lib.m4 m4/geany-mac-integration.m4 m4/geany-mingw.m4 m4/geany-revision.m4 m4/geany-status.m4 makefile.win32 plugins/Makefile.am plugins/classbuilder.c plugins/demoplugin.c plugins/demoproxy.c plugins/demoproxytest.px plugins/export.c plugins/filebrowser.c plugins/geanyfunctions.h plugins/geanyplugin.h plugins/genapi.py plugins/htmlchars.c plugins/saveactions.c plugins/splitwindow.c po/POTFILES.in po/POTFILES.skip po/ar.po po/ast.po po/be.po po/bg.po po/ca.po po/cs.po po/de.po po/el.po po/en_GB.po po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po po/gl.po po/he.po po/hi.po po/hu.po po/id.po po/intl_stats.sh po/it.po po/ja.po po/kk.po po/ko.po po/lb.po po/lt.po po/mn.po po/nl.po po/nn.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sr.po po/sv.po po/tr.po po/uk.po po/vi.po po/zh_CN.po po/zh_TW.po scintilla/Makefile.am scintilla/gtk/PlatGTK.cxx scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/makefile.win32 scintilla/include/ILexer.h scintilla/include/Makefile.am scintilla/include/Platform.h scintilla/include/SciLexer.h scintilla/include/Sci_Position.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexAbaqus.cxx scintilla/lexers/LexAda.cxx scintilla/lexers/LexAsm.cxx scintilla/lexers/LexBash.cxx scintilla/lexers/LexBasic.cxx scintilla/lexers/LexBatch.cxx scintilla/lexers/LexCOBOL.cxx scintilla/lexers/LexCPP.cxx scintilla/lexers/LexCSS.cxx scintilla/lexers/LexCaml.cxx scintilla/lexers/LexCmake.cxx scintilla/lexers/LexCoffeeScript.cxx scintilla/lexers/LexD.cxx scintilla/lexers/LexDiff.cxx scintilla/lexers/LexErlang.cxx scintilla/lexers/LexForth.cxx scintilla/lexers/LexFortran.cxx scintilla/lexers/LexHTML.cxx scintilla/lexers/LexHaskell.cxx scintilla/lexers/LexLaTeX.cxx scintilla/lexers/LexLisp.cxx scintilla/lexers/LexLua.cxx scintilla/lexers/LexMake.cxx scintilla/lexers/LexMarkdown.cxx scintilla/lexers/LexMatlab.cxx scintilla/lexers/LexNsis.cxx scintilla/lexers/LexNull.cxx scintilla/lexers/LexOthers.cxx scintilla/lexers/LexProps.cxx scintilla/lexers/LexRuby.cxx scintilla/lexers/LexRust.cxx scintilla/lexers/LexSQL.cxx scintilla/lexers/LexTCL.cxx scintilla/lexers/LexVHDL.cxx scintilla/lexers/LexVerilog.cxx scintilla/lexlib/Accessor.cxx scintilla/lexlib/Accessor.h scintilla/lexlib/LexAccessor.h scintilla/lexlib/LexerBase.cxx scintilla/lexlib/LexerBase.h scintilla/lexlib/LexerModule.cxx scintilla/lexlib/LexerModule.h scintilla/lexlib/LexerNoExceptions.cxx scintilla/lexlib/LexerNoExceptions.h scintilla/lexlib/LexerSimple.cxx scintilla/lexlib/LexerSimple.h scintilla/lexlib/StyleContext.cxx scintilla/lexlib/StyleContext.h scintilla/lexlib/SubStyles.h scintilla/lexlib/WordList.cxx scintilla/makefile.win32 scintilla/scintilla_changes.patch scintilla/src/AutoComplete.cxx scintilla/src/CallTip.cxx scintilla/src/CaseConvert.cxx scintilla/src/CaseFolder.cxx scintilla/src/Catalogue.cxx scintilla/src/CellBuffer.cxx scintilla/src/CellBuffer.h scintilla/src/CharClassify.cxx scintilla/src/ContractionState.cxx scintilla/src/ContractionState.h scintilla/src/Decoration.cxx scintilla/src/Document.cxx scintilla/src/Document.h scintilla/src/EditModel.cxx scintilla/src/EditModel.h scintilla/src/EditView.cxx scintilla/src/EditView.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/ExternalLexer.cxx scintilla/src/Indicator.cxx scintilla/src/Indicator.h scintilla/src/KeyMap.cxx scintilla/src/LineMarker.cxx scintilla/src/LineMarker.h scintilla/src/MarginView.cxx scintilla/src/MarginView.h scintilla/src/PerLine.cxx scintilla/src/PerLine.h scintilla/src/Position.h scintilla/src/PositionCache.cxx scintilla/src/PositionCache.h scintilla/src/RESearch.cxx scintilla/src/RESearch.h scintilla/src/RunStyles.cxx scintilla/src/ScintillaBase.cxx scintilla/src/ScintillaBase.h scintilla/src/Selection.cxx scintilla/src/Selection.h scintilla/src/SplitVector.h scintilla/src/Style.cxx scintilla/src/Style.h scintilla/src/UniConversion.cxx scintilla/src/UniConversion.h scintilla/src/ViewStyle.cxx scintilla/src/ViewStyle.h scintilla/src/XPM.cxx scintilla/version.txt scripts/cross-build-mingw.sh scripts/gtk-bundle-from-msys2.sh scripts/update-scintilla.sh src/Makefile.am src/about.c src/app.h src/build.c src/build.h src/callbacks.c src/callbacks.h src/dialogs.c src/dialogs.h src/document.c src/document.h src/documentprivate.h src/editor.c src/editor.h src/encodings.c src/encodings.h src/filetypes.c src/filetypes.h src/gb.c src/geany.h src/gtkcompat.h src/highlighting.c src/highlighting.h src/highlightingmappings.h src/keybindings.c src/keybindings.h src/keybindingsprivate.h src/keyfile.c src/keyfile.h src/libmain.c src/log.c src/main.c src/main.h src/makefile.win32 src/msgwindow.c src/msgwindow.h src/navqueue.c src/navqueue.h src/notebook.c src/osx.c src/osx.h src/plugindata.h src/pluginprivate.h src/plugins.c src/pluginutils.c src/pluginutils.h src/prefs.c src/prefs.h src/printing.c src/project.c src/project.h src/projectprivate.h src/sciwrappers.c src/sciwrappers.h src/search.c src/search.h src/sidebar.c Modified: .gitignore 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -39,6 +39,7 @@ Makefile.in /geany.glade.bak /geany.gladep.bak /geany.pc +/geany.nsi /geany.spec /geany_private.res /global.tags.old @@ -92,6 +93,7 @@ Makefile.in # /src/ #----------------------------------------------------------------------- /src/geany +/src/signallist.i #----------------------------------------------------------------------- # /doc/ @@ -99,6 +101,7 @@ Makefile.in /doc/Doxyfile /doc/Doxyfile.stamp /doc/geany.1 +/doc/geany.html /doc/hacking.html /doc/*.pdf /doc/*.aux Modified: .travis.yml 34 lines changed, 34 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,34 @@ +# we use both C and C++, so advertize C++ +language: cpp +compiler: + - gcc +env: + - GTK3=no + - GTK3=yes + - GTK3=no MINGW=yes + - GTK3=yes MINGW=yes +before_install: + - sudo apt-get update -qq +install: + - sudo apt-get install -y intltool libtool + - test -n "$MINGW" || sudo apt-get install -y libgtk2.0-dev libgtk-3-dev + - test -z "$MINGW" || sudo apt-get install -y mingw-w64-tools g++-mingw-w64-i686 gcc-mingw-w64-i686 binutils-mingw-w64-i686 + - sudo apt-get install -y python-docutils rst2pdf + # try not to install doxygen-latex because we don't need it and it's huge + - sudo apt-get install -y --no-install-recommends doxygen +before_script: + - export CFLAGS="-g -O2 -Werror=pointer-arith -Werror=aggregate-return -Werror=implicit-function-declaration" +script: + - NOCONFIGURE=1 ./autogen.sh + - > + if [ -n "$MINGW" ]; then + arg=-2; [ "$GTK3" = yes ] && arg=-3; + unset CC CXX; + sh ./scripts/cross-build-mingw.sh $arg; + else + mkdir _build && + cd _build && + ../configure --enable-gtk3=$GTK3 && + make -j2 && + make -j2 check; + fi Modified: HACKING 67 lines changed, 46 insertions(+), 21 deletions(-) =================================================================== @@ -11,8 +11,12 @@ About this file This file contains information for anyone wanting to work on the Geany codebase. You should be aware of the open source licenses used - see the README file or the documentation. It is reStructuredText; the -source file is HACKING. You can generate hacking.html by running ``make -hacking-doc`` from the doc/ subdirectory. +source file is HACKING. + +You can generate this file by: + +* Passing the *--enable-html-docs* option to ``configure``. +* Running ``make`` from the doc/ subdirectory. Writing plugins --------------- @@ -28,8 +32,12 @@ You should generate and read the plugin API documentation, see below. Plugin API documentation ^^^^^^^^^^^^^^^^^^^^^^^^ You can generate documentation for the plugin API using the doxygen -tool. Run ``make api-doc`` in the doc subdirectory. The documentation -will be output to doc/reference/index.html. +tool: + +* Pass the *--enable-api-docs* option to ``configure``. +* Run ``make`` from the doc/ subdirectory. + +The documentation will be output to doc/reference/index.html. Alternatively you can view the API documentation online at http://www.geany.org/manual/reference/. @@ -90,7 +98,7 @@ See `Committing`_ for more information. Windows tools ------------- -* Git: http://git-scm.com/ and http://code.google.com/p/msysgit/ +* Git: http://git-scm.com/ and http://msysgit.github.io/ * diff, grep, etc: http://mingw.org/ or http://unxutils.sourceforge.net/ See also the 'Building on Windows' document on the website. @@ -153,21 +161,20 @@ Glade Add user-interface widgets to the Glade 3 file ``data/geany.glade``. Callbacks for the user-interface should go in ``src/callbacks.c``. +Use Glade 3.8.5. The 3.8 series still supports GTK+ 2, and earlier +point releases did not preserve the order of XML elements, leading to +unmanageable diffs. + GTK versions & API documentation -------------------------------- -Geany requires GTK >= 2.16 and GLib >= 2.20. API symbols from newer +Geany requires GTK >= 2.24 and GLib >= 2.28. API symbols from newer GTK/GLib versions should be avoided or made optional to keep the source code building on older systems. -The official GTK 2.16 API documentation may not be available online -anymore, so we put it on http://www.geany.org/manual/gtk/. There -is also a tarball with all available files for download and use with -devhelp. - -Using the 2.16 API documentation of the GTK libs (including GLib, GDK -and Pango) has the advantages that you don't get confused by any -newer API additions and you don't have to take care about whether -you can use them or not. +It is recommended to use the 2.24 API documentation of the GTK +libs (including GLib, GDK and Pango) has the advantages +that you don't get confused by any newer API additions and you +don't have to take care about whether you can use them or not. Coding ------ @@ -175,8 +182,8 @@ Coding them down into smaller static functions where possible. This makes code much easier to read and maintain. * Use GLib types and functions - gint not int, g_free() not free(). -* Your code should build against GLib 2.20 and GTK 2.16. At least for the - moment, we want to keep the minimum requirement for GTK at 2.16 (of +* Your code should build against GLib 2.27.3 and GTK 2.24. At least for the + moment, we want to keep the minimum requirement for GTK at 2.24 (of course, you can use the GTK_CHECK_VERSION macro to protect code using later versions). * Variables should be declared before statements. You can use @@ -491,7 +498,7 @@ first (scintilla or ctags). If you want to reuse an existing lexer and/or tag parser, making a custom filetype is probably easier - it doesn't require any changes to the source code. Follow instructions in the manual: -http://geany.org/manual/geany.html#custom-filetypes. Don't forget to +http://geany.org/manual/index.html#custom-filetypes. Don't forget to update the ``[Groups]`` section in ``filetype_extensions.conf``. .. warning:: @@ -608,11 +615,13 @@ Adding a TagManager parser ^^^^^^^^^^^^^^^^^^^^^^^^^^ This assumes the filetype for Geany already exists. -First write or find a CTags compatible parser, foo.c. Note that there -are some language patches for CTags at: +First write or find a CTags compatible parser, foo.c. Check this fork: +https://github.com/fishman/ctags + +There may be some unmerged language patches for CTags at: http://sf.net/projects/ctags - see the tracker. -(You can also try the Anjuta project's tagmanager codebase.) +(You can also try the Anjuta project's anjuta-tags codebase.) .. note:: From Geany 1.22 GLib's GRegex engine is used instead of POSIX @@ -668,6 +677,22 @@ When you have these two files, you have to list your new test along the other ones in the ``test_source`` variable in ``tests/ctags/Makefile.am``. Please keep this list sorted alphabetically. +Upgrading Scintilla +------------------- + +To upgrade the local Scintilla copy, use the ``scripts/update-scintilla.sh`` +script. + +To use it, you need to first obtain a copy of the Scintilla sources you want +to update to. This will generally mean checking out a release tag from the +Scintilla Mercurial repository, or extracting a tarball. + +Then, just run the script from Geany's to source directory passing the path +to the Scintilla source directory as first argument, and follow the +instructions, if any:: + + ./scripts/update-scintilla.sh /path/to/scintilla/ + GDB --- Modified: Makefile.am 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -44,6 +44,15 @@ uninstall-local: install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2 +if MINGW + $(INSTALL_DATA) $(srcdir)/AUTHORS $(DESTDIR)$(prefix)/Authors.txt + $(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(prefix)/Changelog.txt + $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(prefix)/Copying.txt + $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(prefix)/Readme.txt + $(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(prefix)/News.txt + $(INSTALL_DATA) $(srcdir)/THANKS $(DESTDIR)$(prefix)/Thanks.txt + $(INSTALL_DATA) $(srcdir)/TODO $(DESTDIR)$(prefix)/Todo.txt +endif dist-hook: @if test -d "$(top_srcdir)/.git"; then \ Modified: NEWS 161 lines changed, 160 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,163 @@ -Geany 1.25 (unreleased) +Geany 1.26 (unreleased) + + Internationalization + * Updated translations: de, el, es, fr, kk, pt, sv + + +Geany 1.25 (July 12, 2015) + + General + * GTK3 support, while not enabled by default, is now considered stable. + * Improve MacOS X support (PR#396, PR#419, PR#420, Jiří Techet). + * Improve subprocess spawning (especially on Windows) (PR#441, + Dimitar Zhekov). + * Huge tag management performance improvement (auto-completion, + calltips, etc.) (PR#356, Jiří Techet). + * Remove broken "Show macro list" keybinding and feature (PR#378). + * Add %l substitution to build commands (PR#289, Martin Spacek). + * Depend on GTK 2.24 and GLib 2.28. + * Add per-project line wrapping, line breaking and comment + continuation settings. + * The plugin API is now split out of the main executable into libgeany, + a shared library plugins have to link against. + + Bug fixes + * Fix applying filetype-specific indentation settings for newly + opened files. + * Fix relative project base path when creating a new project + (#1062). + * Fix next/previous keybindings when no files are open. + * Fix markup injection in some tooltips (#1091). + * Use absolute project path for projects opened from the command + line (PR#431, Jiří Techet). + * Fix goto tag in some cases when the same symbol name appears in + different languages (PR#487, Jiří Techet). + * Fix UI updating after loading a project. + * Fix the currently selected document after Save All. + * Fix leftovers in the Project dialog in some cases (PR#363, Jiří + Techet). + * Fix function return type in symbol list tooltips in some cases + (PR#475, Jiří Techet). + * Fix VTE path following on startup. + + Interface + * Show document-related dialogs embedded in the main window ("info + bars") (PR#277, Matthew Brush and Thomas Martitz). + * Plugin manager dialog cleanup and overhaul (PR#251, PR#414). + * Filetypes can now define the MIME type used to select their icon + (PR#179). + * Close documents in the sidebar with middle mouse button (PR#172, + Pavel Roschin). + * Ask whether to replace project files when creating a project. + * Ask whether to adopt the open documents when creating a new + project (PR#315). + * Allow to disable the list of recent files. + * Fix many shadow inconsistencies (PR#411, Jiří Techet). + * Add virtual column and selected chars to the statusbar (Patch #10, + Dimitar Zhekov). + * Add "dirty" terminal indication (PR#476, Jiří Techet). + * Allow to select the None filetype in the Open File dialog + (Issue#483). + * Add configuration menu entries for all filetypes (PR#491, Jiří Techet). + + Editor + * Update Scintilla to version 3.5.6 (#1041). + * Do not comment out blank lines when toggling comments (PR#79, Igor + Shaula). + * Improve handling of Verilog strings and comments. + * Support for keeping undo history when reloading files (PR#188, Arthur + Rosenstein). This is not enabled by default in this release. + * Respect filetype.common's wordchars if a filetype doesn't have its own + (Issue#492, PR#501). + + Search + * Add support for single-line regular expressions (PR#310). + * Default action is now "Replace & Find" in the replace dialog but + can be configured (Roland Pallai). + * Activate default action from all fields in the Find in Files + dialog (#959). + + Filetypes + * Add JSON filetype. + * Add Zephir filetype. + * Add CoffeScript filetype (PR#230, Mark Dresselhaus). + * Add Go tags parser (PR#373, PR#481, Issue#238, Jiří Techet). + * Add Erlang tags parser (PR#445, Beng Tan). + * Add PowerShell tags parser (PR#477). + * Many JavaScript parsing fixes and improvements. + * Many CSS parser fixes and improvements. + * Many Txt2tags parsing fixes and improvements (feature #690). + * Make parser fixes and improvements. + * Parse D enum base type (PR#404). + * Various small Rust fixes (PR#306, SiegeLord). + * Highlight C types in C++. + * Add some missing C11 keywords. + * Add some missing SQL keywords. + * Fix and add some CSS keywords (PR#333, Hannes Heute). + * Fix some FreeBasic keywords (#691). + * Add some missing D keywords (PR#293, Danyal Zia). + * Fix R keywords and wordchars (PR#273, landroni). + * Fix styling of some CSS elements. + * Fix styling of Lua preprocessor. + * Fix style of PHP variables interpolation. + * Recognize `.vbs` files as FreeBasic (PR#171, Nicolas Karolak). + * Recognize `.tpl` files as HTML. + * Recognize `.xtpl` files as XML. + * Recognize `.xpm` files as C. + * Recognize more Bash files (PR#291, Peter Bittner). + * Update templates for Python and Vala. + * Add template for HTML5. + * Fix parsing of some Python triple-quoted strings. + * Add some linting tools to some filetype's default Build menu. + * Fix scope of some Python symbols. + * Fix support of trigraphs in C-like languages. + * Add support of digraphs in C-like languages. + * Add support of `final`, `override` and `noexcept` C++11 keywords + (PR#544). + + Internationalization + * Update translations: be, ca, cs, de, el, es, fr, id, it, ja, nl, pl, + pt_BR, pt, ru, sl, sr, sv, zh_CN. + + Plugins + * File Browser: use "explorer" as the default open command on + Windows. + * File Browser: use icons based on the detected file's MIME type (PR#455, + Jiří Techet). + * Save Actions: use mode 0600 for backup copies (#833, PR#413). + * Split Window: Fix a few keybindings (cut, copy, paste, delete, + select all) (PR#467, Alex). + + API + * Hide private API (PR#351, Jiří Techet, and PR#429, Matthew Brush and + Thomas Martitz). + * Cleaner and safer TagManager API (Part of PR#356, Jiří Techet). + * Entry point prototypes are now checked by the compiler (PR#359). + * Add pseudo-unique document IDs through GeanyDocument::id and + document_find_by_id(). This is a safer API for keeping a reference + to a document for a long time (PR#256). + * Add convenient and portable spawning API: spawn_sync(), spawn_async(), + spawn_with_callbacks(), spawn_kill_process(), spawn_check_command(), + spawn_write_data() (PR#441, Dimitar Zhekov). + * plugin_signal_connect() is now safe to use also with objects + destroyed before unloading the plugin. + * Add document_reload_force() to replace document_reload_file(). + * Add project_write_config() (PR#361, Jiří Techet). + * Add keybindings_get_modifiers() and GEANY_PRIMARY_MOD_MASK (Jiří + Techet). + * Fix emission of the 'document-activate' signal in some cases. + * Add ui_tree_view_set_tooltip_text_column(). + * Add scintilla_get_type(). + + Windows + * Use native Windows quoting rules for commands (on Windows, part of + subprocess spawning improvements). + * Prompt before overwriting existing files when using native Save As + dialog (PR#113, Adam Coyne). + * View -> Change Font now respects the native dialog setting. + * Fix main window freeze when displaying native dialogs. + * Use the same plugin directory as other platforms (PR#540, Thomas + Martitz). Geany 1.24.1 (April 16, 2014) Modified: README 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -8,8 +8,8 @@ Geany is a small and lightweight integrated development environment. It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME. So it -is using only the GTK2 toolkit and therefore you need only the -GTK2 runtime libraries to run Geany. +is using only the GTK+ toolkit and therefore you need only the +GTK+ runtime libraries to run Geany. Features @@ -28,8 +28,8 @@ The basic features of Geany are: Requirements ------------ -For compiling Geany yourself, you will need the GTK (>= 2.16.0) -libraries and header files. You will also need its dependency libraries +For compiling Geany yourself, you will need the GTK2 (>= 2.24) or +GTK3 libraries and header files. You will also need its dependency libraries and header files, such as Pango, Glib and ATK. All these files are available at http://www.gtk.org. @@ -63,7 +63,7 @@ $ geany on a console or use the applications menu from your desktop environment. There a few command line options. See the manual page of Geany or run $ geany --help -for details. Or look into the documention in the doc/ directory. +for details. Or look into the documentation in the doc/ directory. The most important option probably is -c or --config, where you can specify an alternate configuration directory. @@ -102,7 +102,7 @@ file. -- -2005-2014 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz +2005-2015 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com lists(dot)ban(at)herbesfolles(dot)org Modified: README.Packagers 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -30,6 +30,9 @@ Geany still has a fallback mechanism for syntax highlighting (if filetypes.common is installed) but several other features for certain filetypes will fail (mainly build support). +For 32 bit builds targetting systems which support large filesystems +(eg XFS) it may be necessary to build with -D_FILE_OFFSET_BITS=64. + Testing your package -------------------- Modified: THANKS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -143,7 +143,7 @@ Alexandre Moreira <alexandream(at)gmail(dot)com> - pt_BR Adrovane Marques Kade <adrovane(at)gmail(dot)com> - pt_BR Rafael Peregrino da Silva <rperegrino(at)linuxnewmedia(dot)com(dot)br> - pt_BR Alex Eftimie <alex(at)rosedu(dot)org> - ro -brahmann_ <brahmann(at)pisem(dot)net> - ru +brahmann_ <brahmann(at)lifec0re(dot)net> - ru Nikita E. Shalaev <nshalaev(at)eu(dot)spb(dot)ru> - ru stat.c <Static-Const(at)yandex(dot)ru> - ru Andrew Drynov <adryno(at)gmail(dot)com> - ru Modified: configure.ac 27 lines changed, 19 insertions(+), 8 deletions(-) =================================================================== @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([Geany], [1.25], +AC_INIT([Geany], [1.26], [https://sourceforge.net/tracker/?group_id=153444&atid=787791]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) @@ -24,6 +24,7 @@ fi AC_USE_SYSTEM_EXTENSIONS m4_ifdef([AM_PROG_AR],[AM_PROG_AR]) +LT_INIT([disable-static]) AC_PROG_CC AC_PROG_CC_C99 AM_PROG_CC_C_O @@ -49,7 +50,7 @@ AC_TYPE_SIZE_T AC_STRUCT_TM # Checks for library functions. -AC_CHECK_FUNCS([ftruncate fgetpos mkstemp strerror strstr]) +AC_CHECK_FUNCS([ftruncate fgetpos fnmatch mkstemp strerror strstr]) # autoscan end @@ -69,17 +70,18 @@ AS_IF([test "x$enable_gtk3" = xyes], [gtk_package=gtk+-3.0 gtk_min_version=3.0], [gtk_package=gtk+-2.0 - gtk_min_version=2.16]) + gtk_min_version=2.24]) AM_CONDITIONAL([GTK3], [test "x$gtk_package" = "xgtk+-3.0"]) # GTK/GLib/GIO checks -gtk_modules="$gtk_package >= $gtk_min_version glib-2.0 >= 2.20" -gtk_modules_private="gio-2.0 >= 2.20 gmodule-2.0" +gtk_modules="$gtk_package >= $gtk_min_version glib-2.0 >= 2.28" +gtk_modules_private="gio-2.0 >= 2.28 gmodule-no-export-2.0" PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private]) AC_SUBST([DEPENDENCIES], [$gtk_modules]) AC_SUBST([GTK_CFLAGS]) AC_SUBST([GTK_LIBS]) GTK_VERSION=`$PKG_CONFIG --modversion $gtk_package` +AC_SUBST([GTK_VERSION]) GEANY_STATUS_ADD([Using GTK version], [${GTK_VERSION}]) # GTHREAD checks gthread_modules="gthread-2.0" @@ -87,7 +89,7 @@ PKG_CHECK_MODULES([GTHREAD], [$gthread_modules]) AC_SUBST([GTHREAD_CFLAGS]) AC_SUBST([GTHREAD_LIBS]) -# --disable-deprecated switch for GTK2 purification +# --disable-deprecated switch for GTK purification AC_ARG_ENABLE([deprecated], [AS_HELP_STRING([--disable-deprecated], [Disable deprecated GTK functions.])], [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], @@ -105,18 +107,26 @@ GEANY_CHECK_MINGW GEANY_CHECK_SOCKET GEANY_CHECK_VTE +GEANY_CHECK_MAC_INTEGRATION GEANY_CHECK_THE_FORCE dnl hehe # i18n GEANY_I18N -GEANY_DATA_DIR=`eval echo ${datarootdir}/geany` -AC_SUBST([GEANY_DATA_DIR]) +# double eval since datarootdir is usually defined as ${prefix}/share +AM_COND_IF([MINGW], + [pkgdatadir='${prefix}/data'], + [pkgdatadir='${datarootdir}/geany']) +AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))]) +AC_SUBST([pkgdatadir]) # Documentation tools GEANY_CHECK_DOCUTILS GEANY_CHECK_DOXYGEN +# libgeany +GEANY_LIB_INIT + # Output AC_CONFIG_FILES([ Makefile @@ -146,6 +156,7 @@ AC_CONFIG_FILES([ doc/geany.1 geany.spec geany.pc + geany.nsi doc/Doxyfile tests/Makefile tests/ctags/Makefile Modified: data/Makefile.am 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -15,6 +15,7 @@ filetypes = \ filetypes.Clojure.conf \ filetypes.cmake \ filetypes.cobol \ + filetypes.coffeescript \ filetypes.common \ filetypes.conf \ filetypes.cpp \ @@ -33,13 +34,14 @@ filetypes = \ filetypes.freebasic \ filetypes.Genie.conf \ filetypes.glsl \ - filetypes.Go.conf \ + filetypes.go \ filetypes.Graphviz.conf \ filetypes.haskell \ filetypes.haxe \ filetypes.html \ filetypes.java \ filetypes.javascript \ + filetypes.JSON.conf \ filetypes.latex \ filetypes.lisp \ filetypes.lua \ @@ -67,7 +69,8 @@ filetypes = \ filetypes.verilog \ filetypes.vhdl \ filetypes.xml \ - filetypes.yaml + filetypes.yaml \ + filetypes.zephir tagfiles = \ c99.tags \ Modified: data/c99.tags 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1358,6 +1358,7 @@ sinh sinhf�1024�(float __x)�0�float sinhl�1024�(long double __x)�0�long double sinl�1024�(long double __x)�0�long double +size_t�4096�0�__SIZE_TYPE__ snprintf�1024�(char * __s, size_t __maxlen, const char * __format, ...)�0�int sprintf�1024�(char * __s, const char * __format, ...)�0�int sqrt�1024�(double __x)�0�double Modified: data/filetype_extensions.conf 21 lines changed, 12 insertions(+), 9 deletions(-) =================================================================== @@ -6,16 +6,17 @@ Abaqus=*.inp; Abc=*.abc;*.abp; ActionScript=*.as; Ada=*.adb;*.ads; -Asciidoc=*.asciidoc; +Asciidoc=*.asciidoc;*.adoc; ASM=*.asm; Batch=*.bat;*.cmd;*.nt; CAML=*.ml;*.mli; -C=*.c;*.h; +C=*.c;*.h;*.xpm; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; CUDA=*.cu;*.cuh;*.h; C#=*.cs; CMake=CMakeLists.txt;*.cmake;*.ctest; COBOL=*.cob;*.cpy;*.cbl;*.cobol; +CoffeeScript=*.coffee;Cakefile;*.Cakefile;*.coffee.erb;*.iced;*.iced.erb; Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;*.properties; CSS=*.css; Cython=*.pyx;*.pxd;*.pxi; @@ -23,10 +24,10 @@ D=*.d;*.di; Diff=*.diff;*.patch;*.rej; Docbook=*.docbook; Erlang=*.erl;*.hrl; -F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP +F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP; Ferite=*.fe; Forth=*.fs;*.fth; -Fortran=*.f90;*.f95;*.f03;*.f08;*.F90;*.F95;*.F03;*.F08 +Fortran=*.f90;*.f95;*.f03;*.f08;*.F90;*.F95;*.F03;*.F08; FreeBasic=*.bas;*.bi;*.vbs; Genie=*.gs; GLSL=*.glsl;*.frag;*.vert; @@ -34,9 +35,10 @@ Go=*.go; Graphviz=*.gv;*.dot; Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot; Haxe=*.hx; -HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm; +HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl; Java=*.java;*.jsp; Javascript=*.js; +JSON=*.json; LaTeX=*.tex;*.sty;*.idx;*.ltx;*.latex;*.aux;*.bib; Lisp=*.lisp; Lua=*.lua; @@ -56,21 +58,22 @@ R=*.R;*.r; Rust=*.rs; Ruby=*.rb;*.rhtml;*.ruby;*.gemspec;Gemfile;rakefile;Rakefile; Scala=*.scala;*.scl; -Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;*.ash;*.bash;*.m4;PKGBUILD;*profile; +Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;*.ash;*.bash;.bashrc;bash.bashrc;.bash_*;bash_*;*.m4;PKGBUILD;*profile; SQL=*.sql; Tcl=*.tcl;*.tk;*.wish; Txt2tags=*.t2t; Vala=*.vala;*.vapi; Verilog=*.v; VHDL=*.vhd;*.vhdl; -XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd; +XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl;*.mml;*.mathml; YAML=*.yaml;*.yml; +Zephir=*.zep; None=*; # Note: restarting is required after editing groups [Groups] -Programming=Clojure;CUDA;Cython;Genie;Go;Rust;Scala; +Programming=Clojure;CUDA;Cython;Genie;Scala; Script=Graphviz; Markup= -Misc= +Misc=JSON; None= Modified: data/filetypes.JSON.conf 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,15 @@ +[styling=C] + +[keywords] +primary=true false null + +[settings] +lexer_filetype=Javascript +tag_parser=JSON +extension=json +mime_type=application/json + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: data/filetypes.c 21 lines changed, 14 insertions(+), 7 deletions(-) =================================================================== @@ -33,7 +33,7 @@ escapesequence=string_1 [keywords] # all items must be in one line -primary=asm auto break case char const continue default do double else enum extern float for goto if inline int long register restrict return short signed sizeof static struct switch typedef union unsigned void volatile while FALSE NULL TRUE +primary=asm auto break case char const continue default do double else enum extern float for goto if inline int long register restrict return short signed sizeof static struct switch typedef union unsigned void volatile while _Alignas _Alignof _Atomic _Bool _Complex _Generic _Imaginary _Noreturn _Static_assert _Thread_local FALSE NULL TRUE secondary= # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem @@ -78,12 +78,19 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=gcc -Wall -c "%f" -linker=gcc -Wall -o "%e" "%f" -run_cmd="./%e" - - +FT_00_LB=_Compile +FT_00_CM=gcc -Wall -c "%f" +FT_00_WD= +FT_01_LB=_Build +FT_01_CM=gcc -Wall -o "%e" "%f" +FT_01_WD= +FT_02_LB=_Lint +FT_02_CM=cppcheck --language=c --enable=warning,style --template=gcc "%f" +FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%e" +EX_00_WD= Modified: data/filetypes.coffeescript 49 lines changed, 49 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,49 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +character=character +commentblock=comment +commentline=comment_line +default=default +globalclass=class +identifier=identifier_1 +number=number_1 +operator=operator +regex=regex +string=string_1 +stringeol=string_eol +verbose_regex=regex +verbose_regex_comment=comment +word2=keyword_2 +word=keyword_1 +instanceproperty=identifier_2 + + +[settings] +extension=coffee +comment_single=# +comment_open=### +comment_close=### +comment_use_indent=true +context_action_cmd= + + +[keywords] +# all items must be in one line +primary=and break by case catch class const continue default delete do each else extends false finally for get if in Infinity instanceof is isnt let loop NaN new no not null of off on or return set switch then this throw true try typeof undefined unless until void when where while with yes yield +secondary=constructor decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt prototype require super +# types, classes +globalclass=Array Boolean Date Error EvalError Function Math Number Object RangeError ReferenceError RegExp String SyntaxError TypeError URIError + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + +[build-menu] +FT_00_LB=Compile into _Javascript +FT_00_CM=coffee --compile "%f" +FT_01_LB=View compiled _Javascript +FT_01_CM=coffee -p "%f" +EX_00_LB=Run +EX_00_CM=coffee "%f" + Modified: data/filetypes.common 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -97,6 +97,7 @@ calltips=call_tips # which characters should be skipped when moving (or included when deleting) to word boundaries # should always include space and tab (\s\t) whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~ +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 [named_styles] # This is the Default "built-in" color scheme Modified: data/filetypes.cpp 20 lines changed, 14 insertions(+), 6 deletions(-) =================================================================== @@ -3,7 +3,7 @@ [keywords] # all items must be in one line -primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int int8_t int16_t int32_t int64_t long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected ptrdiff_t public register reinterpret_cast return short signed sizeof size_t static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq +primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected public register reinterpret_cast return short signed sizeof static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq secondary= # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem @@ -50,11 +50,19 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=g++ -Wall -c "%f" -linker=g++ -Wall -o "%e" "%f" -run_cmd="./%e" - +FT_00_LB=_Compile +FT_00_CM=g++ -Wall -c "%f" +FT_00_WD= +FT_01_LB=_Build +FT_01_CM=g++ -Wall -o "%e" "%f" +FT_01_WD= +FT_02_LB=_Lint +FT_02_CM=cppcheck --language=c++ --enable=warning,style --template=gcc "%f" +FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%e" +EX_00_WD= Modified: data/filetypes.css 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,7 @@ media=parameter primary=background background-attachment background-color background-image background-position background-repeat border border-bottom border-bottom-width border-color border-left border-left-width border-right border-right-width border-style border-top border-top-width border-width clear color display float font font-family font-size font-style font-variant font-weight height letter-spacing line-height list-style list-style-image list-style-position list-style-type margin margin-bottom margin-left margin-right margin-top padding padding-bottom padding-left padding-right padding-top text-align text-decoration text-indent text-transform vertical-align white-space width word-spacing # CSS 2 properties secondary=azimuth border-bottom-color border-bottom-style border-collapse border-left-color border-left-style border-right-color border-right-style border-spacing border-top-color border-top-style bottom caption-side clip content counter-increment counter-reset cue cue-after cue-before cursor direction elevation empty-cells font-size-adjust font-stretch left max-height max-width min-height min-width orphans outline outline-color outline-style outline-width overflow page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position quotes richness right speak speak-header speak-numeral speak-punctuation speech-rate stress table-layout top unicode-bidi visibility voice-family volume widows z-index -css3_properties=alignment-adjust alignment-baseline animation animation-delay animation-direction animation-duration animation-iteration-count animation-name animation-play-state animation-timing-function appearance ascent backface-visibility background-break background-clip background-origin background-size baseline baseline-shift bbox binding bleed bookmark-label bookmark-level bookmark-state bookmark-target border-bottom-left-radius border-bottom-right-radius border-break border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-length border-radius border-top-left-radius border-top-right-radius box-align box-decoration-break box-direction box-flex box-flex-group box-lines box-orient box-pack box-shadow box-sizing box-sizing break-after break-before break-inside cap-height centerline color-profile column-break-after column-break-before column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width columns crop definition-src descent dominant-baseline drop-initial-after-adjust drop-initial-after-align drop-initial-before-adjust drop-initial-before-align drop-initial-size drop-initial-value fit fit-position flex-align flex-flow flex-line-pack flex-order flex-pack float-offset font-effect font-emphasize font-emphasize-position font-emphasize-style font-size-adjust font-smooth grid-columns grid-rows hanging-punctuation hyphenate-after hyphenate-before hyphenate-character hyphenate-lines hyphenate-resource hyphens icon image-orientation image-rendering image-resolution inline-box-align line-break line-stacking line-stacking-ruby line-stacking-shift line-stacking-strategy mark mark-after mark-before marker-offset marks marquee-direction marquee-loop marquee-play-count marquee-speed marquee-style mathline move-to nav-down nav-index nav-left nav-right nav-up opacity outline-offset overflow-style overflow-wrap overflow-x overflow-y page page-policy panose-1 perspective perspective-origin phonemes presentation-level punctuation-trim rendering-intent resize rest rest-after rest-before rotation rotation-point ruby-align ruby-overhang ruby-position ruby-span size slope src stemh stemv string-set tab-side tab-size target target-name target-new target-position text-align-last text-decoration-color text-decoration-line text-decoration-skip text-decoration-style text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-height text-indent text-justify text-outline text-replace text-shadow text-space-collapse text-underline-position text-wrap topline transform transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-range units-per-em voice-balance voice-duration voice-pitch voice-pitch-range voice-rate voice-stress voice-volume white-space-collapse widths word-break word-wrap x-height +css3_properties=align-content align-items align-self alignment-adjust alignment-baseline animation animation-delay animation-direction animation-duration animation-iteration-count animation-name animation-play-state animation-timing-function appearance ascent backface-visibility background-break background-clip background-origin background-size baseline baseline-shift bbox binding bleed bookmark-label bookmark-level bookmark-state bookmark-target border-bottom-left-radius border-bottom-right-radius border-break border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-length border-radius border-top-left-radius border-top-right-radius box-align box-decoration-break box-direction box-flex box-flex-group box-lines box-orient box-pack box-shadow box-sizing box-sizing break-after break-before break-inside cap-height centerline color-profile column-break-after column-break-before column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width columns crop definition-src descent dominant-baseline drop-initial-after-adjust drop-initial-after-align drop-initial-before-adjust drop-initial-before-align drop-initial-size drop-initial-value fit fit-position flex flex-align flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap float-offset font-effect font-emphasize font-emphasize-position font-emphasize-style font-size-adjust font-smooth grid-columns grid-rows hanging-punctuation hyphenate-after hyphenate-before hyphenate-character hyphenate-lines hyphenate-resource hyphens icon image-orientation image-rendering image-resolution inline-box-align justify-content line-break line-stacking line-stacking-ruby line-stacking-shift line-stacking-strategy mark mark-after mark-before marker-offset marks marquee-direction marquee-loop marquee-play-count marquee-speed marquee-style mathline move-to nav-down nav-index nav-left nav-right nav-up opacity order outline-offset overflow-style overflow-wrap overflow-x overflow-y page page-policy panose-1 perspective perspective-origin phonemes presentation-level punctuation-trim rendering-intent resize rest rest-after rest-before rotation rotation-point ruby-align ruby-overhang ruby-position ruby-span size slope src stemh stemv string-set tab-side tab-size target target-name target-new target-position text-align-last text-decoration-color text-decoration-line text-decoration-skip text-decoration-style text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-height text-indent text-justify text-outline text-replace text-shadow text-space-collapse text-underline-position text-wrap topline transform transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-range units-per-em voice-balance voice-duration voice-pitch voice-pitch-range voice-rate voice-stress voice-volume white-space-collapse widths word-break word-wrap x-height pseudoclasses=active checked current disabled empty enabled first-child first-of-type focus hover lang last-of-type link not nth-child nth-last-child nth-last-of-type nth-of-type only-child only-of-type root target visited pseudo_elements=after before choices first-letter first-line line-marker marker outside repeat-index repeat-item selection slot value # use wild card with vendor prefixes for future proof, no need to list specific properties Modified: data/filetypes.freebasic 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,8 +27,8 @@ binnumber=number_1 [keywords] # all items must be in one line -keywords=abs access acos alias allocate alpha and any append as assert assertwarn asc asin asm atan2 atn base beep bin binary bit bitreset bitset bload bsave byref byte byval call callocate case cast cbyte cdbl cdecl chain chdir chr cint circle class clear clng clngint close cls color com cons command common condbroadcast condcreate conddestroy condsignal condwait const constructor continue cos cptr cshort csign csng csrlin cubyte cuint culng culngint cunsg curdir cushort custom cvd cvi cvl cvlongint cvs cvshort data date dateadd datediff datepart dateserial datevalue day deallocate declare defbyte defdbl defint deflng deflngint defshort defsng defstr defubyte defuint defulngint defushort delete destructor dim dir do double draw dynamic dylibfree dylibload dylibsymbol else elseif encoding end enum environ escape eof eqv erase erfn erl ermn err error exec exepath exit exp explicit export extern false fboolean field fileattr filecopy filedatetime fileexists filelen fix flip for format frac fre freefile function get getjoystick getkey getmouse gosub goto hex hibyte hiword hour if iif imageconvertrow imagecreate imagedestroy imp import inkey inp input input$ instr int integer is isdate kill lbound lcase left len let lib lpt line lobyte loc local locate lock lof log long longint loop loword lpos lprint lset ltrim mid minute mkd mkdir mki mkl mklongint mks mkshort mod month monthname multikey mutexcreate mutexdestroy mutexlock mutexunlock name namespace nokeyword next new not now oct offsetof on once open option operator or out output overload paint palette pascal pcopy peek pipe pmap point pointer poke pos preserve preset print private procptr property protected pset ptr public put random randomize read reallocate redim rem reset restore resume return rgb rgba right rmdir rnd rset rtrim run sadd scope scrn screen screencopy screencontrol screenevent screeninfo screenglproc screenlist screenlock screenptr screenres screenset screensync screenunlock second seek select setdate setenviron setmouse settime sgn shared shell short sin single sizeof sleep space spc sqr static stdcall step stop str string strptr sub swap system shr shl tab tan then this threadcreate threadwait time timeserial timevalue timer to trans trim true type ubound ubyte ucase uinteger ulong ulongint union unlock unsigned until ushort using va_arg va_first va_next val vallng valint valuint valulng var varptr view wait wbin wchr weekday weekdayname wend while whex width window windowtitle winput with woct write wspace wstr wstring xor year zstring -preprocessor=#define defined typeof #dynamic #else #endif #error #if #ifdef #ifndef #inclib #include #print #static #undef #macro #endmacro #elseif #libpath #pragma +keywords=abs access acos alias allocate alpha and andalso any append as asc asin asm assert assertwarn atan2 atn base beep bin binary bit bitreset bitset bload bsave byref byte byval call callocate case cast cbyte cdbl cdecl chain chdir chr cint circle class clear clng clngint close cls color com command common condbroadcast condcreate conddestroy condsignal condwait cons const constructor continue cos cptr cshort csign csng csrlin cubyte cuint culng culngint cunsg curdir cushort custom cvd cvi cvl cvlongint cvs cvshort data date dateadd datediff datepart dateserial datevalue day deallocate declare defbyte defdbl defint deflng deflngint defshort defsng defstr defubyte defuint defulngint defushort delete destructor dim dir do double draw dylibfree dylibload dylibsymbol dynamic else elseif encoding end endif enum environ eof eqv erase erfn erl ermn err error escape exec exepath exit exp explicit export extends extern false fboolean field fileattr filecopy filedatetime fileexists filelen fix flip for format frac fre freefile function get getjoystick getkey getmouse gosub goto hex hibyte hiword hour if iif imageconvertrow imagecreate imagedestroy imp import inkey inp input input$ instr instrrev int integer interface is isdate kill lbound lcase left len let lib line lobyte loc local locate lock lof log long longint loop loword lpos lprint lpt lset ltrim mid minute mkd mkdir mki mkl mklongint mks mkshort mod month monthname multikey mutexcreate mutexdestroy mutexlock mutexunlock name namespace new next nokeyword not now object oct offsetof on once open operator option or orelse out output overload paint palette pascal pcopy peek pipe pmap point pointer poke pos preserve preset print private procptr property protected pset ptr public put random randomize read reallocate redim rem reset restore resume return rgb rgba right rmdir rnd rset rtrim run sadd scope screen screencontrol screencopy screenevent screenglproc screeninfo screenlist screenlock screenptr screenres screenset screensync screenunlock scrn second seek select setdate setenviron setmouse settime sgn shared shell shl short shr sin single sizeof sleep space spc sqr static stdcall step stop str string strptr sub swap system tab tan then this threadcreate threadwait time timer timeserial timevalue to trans trim true type ubound ubyte ucase uinteger ulong ulongint union unlock unsigned until ushort using va_arg va_first val valint vallng valuint valulng va_next var varptr view virtual wait wbin wchr weekday weekdayname wend whex while width window windowtitle winput with woct write wspace wstr wstring xor year zstring +preprocessor=#assert #define defined #else #elseif #endif #endmacro #error #if #ifdef #ifndef #inclib #include #lang #libpath #line #macro once #pragma #print typeof #undef # user definable keywords user1= user2= Modified: data/filetypes.go 11 lines changed, 7 insertions(+), 4 deletions(-) =================================================================== @@ -4,16 +4,19 @@ [keywords] # all items must be in one line -primary=break case chan const continue default defer else fallthrough for func go goto if import interface map package range return select struct switch type var -secondary=byte bool rune int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float32 float64 complex64 complex128 uintptr string +primary=break case chan const continue default defer else fallthrough for func go goto if import interface map package range return select struct switch type var true false iota nil +secondary=bool byte complex64 complex128 error float32 float64 int int8 int16 int32 int64 rune string uint uint8 uint16 uint32 uint64 uintptr # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties=C] +[lexer_properties] +lexer.cpp.backquoted.strings=1 +styling.within.preprocessor=1 +lexer.cpp.allow.dollars=0 +fold.preprocessor=0 [settings] -lexer_filetype=C # default extension used when saving files extension=go Modified: data/filetypes.haskell 17 lines changed, 12 insertions(+), 5 deletions(-) =================================================================== @@ -53,8 +53,8 @@ mime_type=text/x-haskell # single comments, like # in this file comment_single=-- # multiline comments -#comment_open= -#comment_close= +comment_open={- +comment_close=-} # set to false if a comment character/string should start at column 0 of a line, true uses any # indentation of the line, e.g. setting to true causes the following on pressing CTRL+d @@ -72,9 +72,16 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=ghc --make "%f" -run_cmd="./%e" +FT_00_LB=_Compile +FT_00_CM=ghc --make "%f" +FT_00_WD= +FT_02_LB=_Lint +FT_02_CM=hlint "%f" +FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%e" +EX_00_WD= Modified: data/filetypes.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ php_comment=comment php_commentline=comment_line php_operator=operator -php_hstring_variable=string_2 +php_hstring_variable=preprocessor php_complex_variable=preprocessor jscript_start=tag Modified: data/filetypes.javascript 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -38,11 +38,11 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler= -run= - - +FT_02_LB=_Lint +FT_02_CM=jshint "%f" +FT_02_WD= +error_regex=([^:]+): line ([0-9]+), col ([0-9]+) Modified: data/filetypes.lua 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -10,7 +10,7 @@ word=keyword_1 string=string_1 character=character literalstring=string_2 -preprocessor=preprocess +preprocessor=preprocessor operator=operator identifier=identifier_1 stringeol=string_eol Modified: data/filetypes.objectivec 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -9,6 +9,7 @@ secondary=@class @defs @dynamic @encode @end @implementation @interface @optiona docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union [lexer_properties=C] +lexer.cpp.verbatim.strings.allow.escapes=1 [settings] # default extension used when saving files Modified: data/filetypes.perl 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -52,7 +52,7 @@ format=string_2 [keywords] -primary=NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept alarm and atan2 bind binmode bless caller chdir chmod chomp chop chown chr chroot close closedir cmp connect continue cos crypt dbmclose dbmopen defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eq eval exec exists exit exp fcntl fileno flock for foreach fork format formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst le length link listen local localtime lock log lstat lt m map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q qq qr quotemeta qu qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir s scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn while write x xor y +primary=NULL __FILE__ __LINE__ __PACKAGE__ __SUB__ __DATA__ __END__ AUTOLOAD BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept alarm and atan2 bind binmode bless caller chdir chmod chomp chop chown chr chroot close closedir cmp connect continue cos crypt dbmclose dbmopen default defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eq eval exec exists exit exp fcntl fileno flock for foreach fork format formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt given glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst le length link listen local localtime lock log lstat lt m map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q qq qr quotemeta qu qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir s say scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat state study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn when while write x xor y [lexer_properties] styling.within.preprocessor=1 Modified: data/filetypes.python 14 lines changed, 11 insertions(+), 3 deletions(-) =================================================================== @@ -61,9 +61,17 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=0 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=python -m py_compile "%f" -run_cmd=python "%f" +FT_00_LB=_Compile +FT_00_CM=python -m py_compile "%f" +FT_00_WD= +FT_02_LB=_Lint +FT_02_CM=pep8 --max-line-length=80 "%f" +FT_02_WD= +error_regex=(.+):([0-9]+):([0-9]+) +EX_00_LB=_Execute +EX_00_CM=python "%f" +EX_00_WD= Modified: data/filetypes.r 11 lines changed, 7 insertions(+), 4 deletions(-) =================================================================== @@ -16,16 +16,19 @@ infixeol=function [keywords] # all items must be in one line -primary=break else F FALSE for function if in Inf NA NaN next NULL repeat require return source T TRUE while -package=abbreviate abline abs acf acos acosh addmargins aggregate agrep alarm alias alist all anova any aov aperm append apply approx approxfun apropos ar args arima array arrows asin asinh assign assocplot atan atanh attach attr attributes autoload autoloader ave axis backsolve barplot basename beta bindtextdomain binomial biplot bitmap bmp body box boxplot bquote browser builtins bxp by bzfile c call cancor capabilities casefold cat category cbind ccf ceiling character charmatch chartr chol choose chull citation class close cm cmdscale codes coef coefficients col colnames colors colorspaces colours comment complex confint conflicts contour contrasts contributors convolve cophenetic coplot cor cos cosh cov covratio cpgram crossprod cummax cummin cumprod cumsum curve cut cutree cycle data dataentry date dbeta dbinom dcauchy dchisq de debug debugger decompose delay deltat demo dendrapply density deparse deriv det detach determinant deviance dexp df dfbeta dfbetas dffits dgamma dgeom dget dhyper diag diff diffinv difftime digamma dim dimnames dir dirname dist dlnorm dlogis dmultinom dnbinom dnorm dotchart double dpois dput drop dsignrank dt dump dunif duplicated dweibull dwilcox eapply ecdf edit effects eigen emacs embed end environment eval evalq example exists exp expression factanal factor factorial family fft fifo file filter find fitted fivenum fix floor flush for force formals format formula forwardsolve fourfoldplot frame frequency ftable gamma gaussian gc gcinfo gctorture get getenv geterrmessage gettext gettextf getwd gl glm globalenv gray grep grey grid gsub gzcon gzfile hat hatvalues hcl hclust head heatmap help hist history hsv httpclient iconv iconvlist identical identify if ifelse image influence inherits integer integrate interaction interactive intersect invisible isoreg jitter jpeg julian kappa kernapply kernel kmeans knots kronecker ksmooth labels lag lapply layout lbeta lchoose lcm legend length letters levels lfactorial lgamma library licence license line lines list lm load loadhistory loadings local locator loess log logb logical loglin lowess ls lsfit machine mad mahalanobis makepredictcall manova mapply match matlines matplot matpoints matrix max mean median medpolish menu merge message methods mget min missing mode monthplot months mosaicplot mtext mvfft names napredict naprint naresid nargs nchar ncol nextn ngettext nlevels nlm nls noquote nrow numeric objects offset open optim optimise optimize options order ordered outer pacf page pairlist pairs palette par parse paste pbeta pbinom pbirthday pcauchy pchisq pdf pentagamma person persp pexp pf pgamma pgeom phyper pi pico pictex pie piechart pipe plclust plnorm plogis plot pmatch pmax pmin pnbinom png pnorm points poisson poly polygon polym polyroot postscript power ppoints ppois ppr prcomp predict preplot pretty princomp print prmatrix prod profile profiler proj promax prompt provide psigamma psignrank pt ptukey punif pweibull pwilcox q qbeta qbinom qbirthday qcauchy qchisq qexp qf qgamma qgeom qhyper qlnorm qlogis qnbinom qnorm qpois qqline qqnorm qqplot qr qsignrank qt qtukey quantile quarters quasi quasibinomial quasipoisson quit qunif quote qweibull qwilcox rainbow range rank raw rbeta rbind rbinom rcauchy rchisq readline real recover rect reformulate regexpr relevel remove reorder rep replace replicate replications reshape resid residuals restart rev rexp rf rgamma rgb rgeom rhyper rle rlnorm rlogis rm rmultinom rnbinom rnorm round row rownames rowsum rpois rsignrank rstandard rstudent rt rug runif runmed rweibull rwilcox sample sapply save savehistory scale scan screen screeplot sd search searchpaths seek segments seq sequence serialize setdiff setequal setwd shell sign signif sin single sinh sink smooth solve sort spectrum spline splinefun split sprintf sqrt stack stars start stderr stdin stdout stem step stepfun stl stop stopifnot str strftime strheight stripchart strptime strsplit strtrim structure strwidth strwrap sub subset substitute substr substring sum summary sunflowerplot supsmu svd sweep switch symbols symnum system table tabulate tail tan tanh tapply tempdir tempfile termplot terms tetragamma text time title toeplitz tolower topenv toupper trace traceback transform trigamma trunc truncate try ts tsdiag tsp typeof unclass undebug union unique uniroot unix unlink unlist unname unserialize unsplit unstack untrace unz update upgrade url var varimax vcov vector version vi vignette warning warnings weekdays weights which window windows with write wsbrowser xedit xemacs xfig xinch xor xtabs xyinch yinch zapsmall -package_other=acme aids aircondit amis aml banking barchart barley beaver bigcity boot brambles breslow bs bwplot calcium cane capability cav censboot channing city claridge cloth cloud coal condense contourplot control corr darwin densityplot dogs dotplot ducks empinf envelope environmental ethanol fir frets gpar grav gravity grob hirose histogram islay knn larrows levelplot llines logit lpoints lsegments lset ltext lvqinit lvqtest manaus melanoma melanoma motor multiedit neuro nitrofen nodal ns nuclear oneway parallel paulsen poisons polar qq qqmath remission rfs saddle salinity shingle simplex singer somgrid splom stripplot survival tau tmd tsboot tuna unit urine viewport wireframe wool xyplot +# use same keywords as in RStudio +# https://github.com/rstudio/rstudio/blob/master/src/gwt/acesupport/acemode/r… +primary=attach break detach else for function if in library new next repeat require return setClass setGeneric setGroupGeneric setMethod setRefClass source stop switch try tryCatch warning while +# use same buildinConstants as in RStudio +package=F FALSE Inf NA NA_integer_ NA_real_ NA_character_ NA_complex_ NaN NULL T TRUE +package_other= [settings] # default extension used when saving files extension=R # the following characters are these which a "word" can contains, see documentation -#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # single comments, like # in this file comment_single=# Modified: data/filetypes.ruby 10 lines changed, 7 insertions(+), 3 deletions(-) =================================================================== @@ -73,9 +73,13 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=ruby -c "%f" -run_cmd=ruby "%f" +FT_00_LB=_Compile +FT_00_CM=ruby -wc "%f" +FT_00_WD= +EX_00_LB=_Execute +EX_00_CM=ruby "%f" +EX_00_WD= Modified: data/filetypes.rust 34 lines changed, 24 insertions(+), 10 deletions(-) =================================================================== @@ -14,6 +14,9 @@ word4=type string=string_1 stringraw=string_2 character=character +bytestring=string_1 +bytestringraw=string_2 +bytecharacter=character operator=operator identifier=identifier_1 lifetime=parameter @@ -22,8 +25,8 @@ lexerror=error [keywords] # all items must be in one line -primary=alignof as be box break const continue crate do else enum extern false fn for if impl in let loop match mod mut offsetof once priv proc pub pure ref return self sizeof static struct super trait true type typeof unsafe unsized use while yield -secondary=bool char f32 f64 i16 i32 i64 i8 int str u16 u32 u64 u8 uint +primary=abstract alignof as become box break const continue crate do else enum extern false final fn for if impl in let loop macro match mod move mut offsetof override priv proc pub pure ref return self sizeof static struct super trait true type typeof unsafe unsized use virtual where while yield +secondary=bool char f32 f64 i16 i32 i64 i8 isize str u16 u32 u64 u8 usize tertiary=Self [lexer_properties] @@ -59,11 +62,22 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] -# %f will be replaced by the complete filename -# %e will be replaced by the filename without extension -# (use only one of it at one time) -compiler=rustc "%f" -linker=rustc -o "%e" "%f" -run_cmd="./%e" - +[build-menu] +FT_00_LB=Compile +FT_00_CM=rustc "%f" +FT_00_WD= +NF_00_LB=Cargo Build +NF_00_CM=cargo build +NF_00_WD= +NF_01_LB=Cargo Test +NF_01_CM=cargo test +NF_01_WD= +NF_02_LB=Cargo Bench +NF_02_CM=cargo bench +NF_02_WD= +EX_00_LB=Run +EX_00_CM="./%e" +EX_00_WD= +EX_01_LB=Cargo Run +EX_01_CM=cargo run +EX_01_WD= Modified: data/filetypes.sh 9 lines changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -52,8 +52,13 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -run_cmd="./%f" +FT_02_LB=_Lint +FT_02_CM=shellcheck --format=gcc "%f" +FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%f" +EX_00_WD= Modified: data/filetypes.sql 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -19,10 +19,11 @@ sqlplus=default sqlplus_prompt=default sqlplus_comment=comment quotedidentifier=identifier_2 +qoperator=operator [keywords] # all items must be in one line -keywords=absolute action add admin after aggregate alias all allocate alter and any are array as asc assertion at authorization auto_increment before begin bfile bigint binary bit blob bool boolean both breadth by call cascade cascaded case cast catalog char charset character check class clob close cluster collate collation column comment commit completion connect connection constraint constraints constructor continue corresponding create cross cube current current_date current_path current_role current_time current_timestamp current_user cursor cycle data date day deallocate dec decimal declare default deferrable deferred delete depth deref desc describe descriptor destroy destructor deterministic diagnostics dictionary dimension disconnect diskgroup distinct domain double drop dynamic each else elsif end end-exec engine equals escape every except exception exec execute exists explain external false fetch first fixed flashback float for foreign found from free full function general get global go goto grant group grouping having host hour identity if ignore immediate in index indextype indicator initialize initially inner inout input insert int integer intersect interval into is isolation iterate join key language large last lateral leading left less level like limit local localtime localtimestamp locator long loop map match materialized mediumblob mediumint mediumtext merge middleint minus minute modifies modify module month names national natural nchar nclob new next no noaudit none not null numeric nvarchar2 object of off old on only open operation option or order ordinality out outer output owner package pad parameter parameters partial path postfix precision prefix preorder prepare preserve primary prior privileges procedure profile public purge raise read reads real recursive ref references referencing regexp regexp_like relative rename replace restrict result return returning returns revoke right role rollback rollup routine row rows savepoint schema scroll scope search second section select sequence session session_user serial set sets size smallint some space specific specifictype sql sqlexception sqlstate sqlwarning start state statement static structure synonym system_user table tablespace temporary terminate text than then time timestamp timezone_hour timezone_minute tinyint to trailing transaction translation treat trigger true truncate type under union unique uniqueidentifier unknown unnest unsigned update usage user using value values varchar varchar2 variable varying view when whenever where while with without work write year zone +keywords=a abort abs absolute access action ada add admin after aggregate alias all allocate also alter always analyse analyze and any are array as asc asensitive assertion assignment asymmetric at atomic attribute attributes audit authorization auto_increment avg avg_row_length backup backward before begin bernoulli between bigint binary bit bit_length bitvar blob bool boolean both breadth break browse bulk by c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain change char char_length character character_length character_set_catalog character_set_name character_set_schema characteristics characters check checked checkpoint checksum class class_origin clob close cluster clustered coalesce cobol collate collation collation_catalog collation_name collation_schema collect column column_name columns command_function command_function_code comment commit committed completion compress compute condition condition_number connect connection connection_name constraint constraint_catalog constraint_name constraint_schema constraints constructor contains containstable continue conversion convert copy corr corresponding count covar_pop covar_samp create createdb createrole createuser cross csv cube cume_dist current current_date current_default_transform_group current_path current_role current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database databases date datetime datetime_interval_code datetime_interval_precision day day_hour day_microsecond day_minute day_second dayofmonth dayofweek dayofyear dbcc deallocate dec decimal declare default defaults deferrable deferred defined definer degree delay_key_write delayed delete delimiter delimiters dense_rank deny depth deref derived desc describe descriptor destroy destructor deterministic diagnostics dictionary disable disconnect disk dispatch distinct distinctrow distributed div do domain double drop dual dummy dump dynamic dynamic_function dynamic_function_code each element else elseif enable enclosed encoding encrypted end end-exec enum equals errlvl escape escaped every except exception exclude excluding exclusive exec execute existing exists exit exp explain external extract false fetch fields file fillfactor filter final first float float4 float8 floor flush following for force foreign fortran forward found free freetext freetexttable freeze from full fulltext function fusion g general generated get global go goto grant granted grants greatest group grouping handler having header heap hierarchy high_priority hold holdlock host hosts hour hour_microsecond hour_minute hour_second identified identity identity_insert identitycol if ignore ilike immediate immutable implementation implicit in include including increment index indicator infile infix inherit inherits initial initialize initially inner inout input insensitive insert insert_id instance instantiable instead int int1 int2 int3 int4 int8 integer intersect intersection interval into invoker is isam isnull isolation iterate join k key key_member key_type keys kill lancompiler language large last last_insert_id lateral leading least leave left length less level like limit lineno lines listen ln load local localtime localtimestamp location locator lock login logs long longblob longtext loop low_priority lower m map match matched max max_rows maxextents maxvalue mediumblob mediumint mediumtext member merge message_length message_octet_length message_text method middleint min min_rows minus minute minute_microsecond minute_second minvalue mlslabel mod mode modifies modify module month monthname more move multiset mumps myisam name names national natural nchar nclob nesting new next no no_write_to_binlog noaudit nocheck nocompress nocreatedb nocreaterole nocreateuser noinherit nologin nonclustered none normalize normalized nosuperuser not nothing notify notnull nowait null nullable nullif nulls number numeric object octet_length octets of off offline offset offsets oids old on online only open opendatasource openquery openrowset openxml operation operator optimize option optionally options or order ordering ordinality others out outer outfile output over overlaps overlay overriding owner pack_keys pad parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parameters partial partition pascal password path pctfree percent percent_rank percentile_cont percentile_disc placing plan pli position postfix power preceding precision prefix preorder prepare prepared preserve primary print prior privileges proc procedural procedure process processlist public purge quote raid0 raiserror range rank raw read reads readtext real recheck reconfigure recursive ref references referencing regexp regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release reload rename repeat repeatable replace replication require reset resignal resource restart restore restrict result return returned_cardinality returned_length returned_octet_length returned_sqlstate returns revoke right rlike role rollback rollup routine routine_catalog routine_name routine_schema row row_count row_number rowcount rowguidcol rowid rownum rows rule save savepoint scale schema schema_name schemas scope scope_catalog scope_name scope_schema scroll search second second_microsecond section security select self sensitive separator sequence serializable server_name session session_user set setof sets setuser share show shutdown signal similar simple size smallint some soname source space spatial specific specific_name specifictype sql sql_big_result sql_big_selects sql_big_tables sql_calc_found_rows sql_log_off sql_log_update sql_low_priority_updates sql_select_limit sql_small_result sql_warnings sqlca sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt ssl stable start starting state statement static statistics status stddev_pop stddev_samp stdin stdout storage straight_join strict string structure style subclass_origin sublist submultiset substring successful sum superuser symmetric synonym sysdate sysid system system_user table table_name tables tablesample tablespace temp template temporary terminate terminated text textsize than then ties time timestamp timezone_hour timezone_minute tinyblob tinyint tinytext to toast top top_level_count trailing tran transaction transaction_active transactions_committed transactions_rolled_back transform transforms translate translation treat trigger trigger_catalog trigger_name trigger_schema trim true truncate trusted tsequal type uescape uid unbounded uncommitted under undo unencrypted union unique unknown unlisten unlock unnamed unnest unsigned until update updatetext upper usage use user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using utc_date utc_time utc_timestamp vacuum valid validate validator value values var_pop var_samp varbinary varchar varchar2 varcharacter variable variables varying verbose view volatile waitfor when whenever where while width_bucket window with within without work write writetext x509 xor year year_month zerofill zone [settings] # default extension used when saving files Modified: data/filetypes.verilog 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -15,12 +15,18 @@ operator=operator identifier=identifier_1 stringeol=string_eol userword=type +comment_word=comment_doc_keyword +input=keyword_4 +output=keyword_4 +inout=keyword_4 +port_connect=keyword_4 [keywords] # all items must be in one line word=always and assign attribute begin buf bufif0 bufif1 case casex casez cmos deassign default defparam disable edge else end endattribute endcase endfunction endmodule endprimitive endspecify endtable endtask event for force forever fork function highz0 highz1 if ifnone initial join medium module large macromodule nand negedge nmos nor not notif0 notif1 or parameter pmos posedge primitive pull0 pull1 pulldown pullup rcmos realtime release repeat rnmos rpmos rtran rtranif0 rtranif1 scalared signed small specify specparam strength strong0 strong1 supply0 supply1 table task tran tranif0 tranif1 tri tri0 tri1 triand trior trireg unsigned vectored wait wand weak0 weak1 while wor xnor xor @ word2=$display $write $fdisplay $fwrite $strobe $fstrobe $monitor $fmonitor $time $realtime $finish $stop $setup $hold $width $setuphold $readmemb $readmemh $sreadmemb $sreadmemh $getpattern $history $save $restart $incsave $shm_open $shm_probe $shm_close $scale $showscopes $showvars word3=real integer time reg wire input output inout +docComment= [settings] # default extension used when saving files Modified: data/filetypes.vhdl 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -4,6 +4,7 @@ default=default comment=comment comment_line_bang=comment_line +block_comment=comment number=number_1 string=string_1 operator=operator Modified: data/filetypes.xml 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -38,3 +38,12 @@ xml_indent_tags=true #width=4 # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +FT_02_LB=_Lint +FT_02_CM=xmllint --noout "%f" +FT_02_WD= +error_regex=(.+):([0-9]+): Modified: data/filetypes.zephir 24 lines changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,24 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=HTML] + +[keywords=HTML] +# all items must be in one line +# these are Zephir instructions, overriding PHP list +php=abstract bool break case catch class const continue default empty else false fetch finally fixed float for foreach function if int integer interface isset let long namespace new null private protected public return static string switch this throw true try typeof uint ulong unlikely var void while + +[lexer_properties=PHP] + +[settings=PHP] +# default extension used when saving files +extension=zep + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=zephir build Modified: data/geany.css 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -9,6 +9,9 @@ -GtkButton-inner-border: 0; padding: 0; } +#geany-close-tab-button GtkImage { + padding: 0; +} /* use monospaced font in search entries for easier reading of regexp (#1907117) */ #GeanyDialogSearch GtkEntry { @@ -34,3 +37,8 @@ #geany-document-status-readonly { color: #007f00; } + +/* red "Terminal" label when terminal dirty */ +#geany-terminal-dirty { + color: #ff0000; +} Modified: data/geany.glade 389 lines changed, 253 insertions(+), 136 deletions(-) =================================================================== @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> + <requires lib="gtk+" version="2.24"/>  <object class="GtkAccelGroup" id="accelgroup1"/> <object class="GtkAdjustment" id="adjustment1"> @@ -70,7 +70,6 @@ <property name="page_increment">10</property> </object> <object class="GtkAdjustment" id="adjustment8"> - <property name="lower">1</property> <property name="upper">50</property> <property name="value">4</property> <property name="step_increment">1</property> @@ -5176,7 +5175,7 @@ <object class="GtkEntry" id="entry_template_datetime"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> @@ -5194,7 +5193,7 @@ <object class="GtkEntry" id="entry_template_year"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> @@ -5212,7 +5211,7 @@ <object class="GtkEntry" id="entry_template_date"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> @@ -6020,7 +6019,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Whether to execute \"cd $path\" when you switch between opened files</property> + <property name="tooltip_text" translatable="yes">Whether to execute "cd $path" when you switch between opened files</property> <property name="draw_indicator">True</property> </object> <packing> @@ -7707,7 +7706,7 @@ <object class="GtkRadioMenuItem" id="crlf"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Convert and Set to _CR/LF (Win)</property> + <property name="label" translatable="yes">Convert and Set to _CR/LF (Windows)</property> <property name="use_underline">True</property> <signal name="activate" handler="on_crlf_activate" swapped="no"/> </object> @@ -7727,7 +7726,7 @@ <object class="GtkRadioMenuItem" id="cr"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Convert and Set to CR (_Mac)</property> + <property name="label" translatable="yes">Convert and Set to CR (Classic _Mac)</property> <property name="use_underline">True</property> <property name="group">crlf</property> <signal name="activate" handler="on_cr_activate" swapped="no"/> @@ -8136,7 +8135,6 @@ <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="treeview2"> <property name="visible">True</property> @@ -8160,12 +8158,10 @@ <object class="GtkScrolledWindow" id="scrolledwindow7"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="treeview6"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="rules_hint">True</property> </object> </child> </object> @@ -8209,144 +8205,129 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkNotebook" id="notebook_info"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="tab_pos">left</property> + <property name="scrollable">True</property> <child> - <object class="GtkViewport" id="viewport1"> + <object class="GtkScrolledWindow" id="scrolledwindow4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="treeview3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + </object> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="notebook_info_label_status"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Status</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkNotebook" id="notebook_info"> + <object class="GtkTreeView" id="treeview5"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tab_pos">left</property> - <property name="scrollable">True</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">True</property> - </object> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="notebook_info_label_status"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Status</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="notebook_info_label_compiler"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Compiler</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">True</property> - </object> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="notebook_info_label_msg"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Messages</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow6"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTextView" id="textview_scribble"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="buffer">textbuffer1</property> - <signal name="motion-notify-event" handler="on_motion_event" swapped="no"/> - </object> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="notebook_info_label_scribble"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Scribble</property> - </object> - <packing> - <property name="position">3</property> - <property name="tab_fill">False</property> - </packing> - </child> + <property name="headers_visible">False</property> </object> </child> </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="notebook_info_label_compiler"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Compiler</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="treeview4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6c9673: Merge pull request #731 from DevynCJohnson/patch-4
by Frank Lanitz 07 Nov '15

07 Nov '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 07 Nov 2015 22:30:35 UTC Commit: 6c96738740f0241ccf2ec67762af6f25cf0bde87 https://github.com/geany/geany/commit/6c96738740f0241ccf2ec67762af6f25cf0bd… Log Message: ----------- Merge pull request #731 from DevynCJohnson/patch-4 Update filetype_extensions.conf Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -16,7 +16,7 @@ CUDA=*.cu;*.cuh;*.h; C#=*.cs; CMake=CMakeLists.txt;*.cmake;*.ctest; COBOL=*.cob;*.cpy;*.cbl;*.cobol; -CoffeeScript=*.coffee;Cakefile;*.Cakefile;*.coffee.erb;*.iced;*.iced.erb +CoffeeScript=*.coffee;Cakefile;*.Cakefile;*.coffee.erb;*.iced;*.iced.erb; Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;*.properties; CSS=*.css; Cython=*.pyx;*.pxd;*.pxi; @@ -24,10 +24,10 @@ D=*.d;*.di; Diff=*.diff;*.patch;*.rej; Docbook=*.docbook; Erlang=*.erl;*.hrl; -F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP +F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP; Ferite=*.fe; Forth=*.fs;*.fth; -Fortran=*.f90;*.f95;*.f03;*.f08;*.F90;*.F95;*.F03;*.F08 +Fortran=*.f90;*.f95;*.f03;*.f08;*.F90;*.F95;*.F03;*.F08; FreeBasic=*.bas;*.bi;*.vbs; Genie=*.gs; GLSL=*.glsl;*.frag;*.vert; @@ -65,7 +65,7 @@ Txt2tags=*.t2t; Vala=*.vala;*.vapi; Verilog=*.v; VHDL=*.vhd;*.vhdl; -XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl; +XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl;*.mml;*.mathml; YAML=*.yaml;*.yml; Zephir=*.zep; None=*; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bc2194: Merge pull request #736 from scriptum/rpg-translate-ru
by Frank Lanitz 07 Nov '15

07 Nov '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 07 Nov 2015 22:20:07 UTC Commit: bc21947d3d3b401684760da7eb24b34c0cdd1fba https://github.com/geany/geany/commit/bc21947d3d3b401684760da7eb24b34c0cdd1… Log Message: ----------- Merge pull request #736 from scriptum/rpg-translate-ru Update of Russian translation Modified Paths: -------------- po/ru.po Modified: po/ru.po 63 lines changed, 33 insertions(+), 30 deletions(-) =================================================================== @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Geany 1.25\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-01 19:03+0100\n" -"PO-Revision-Date: 2015-06-22 11:01+0300\n" +"PO-Revision-Date: 2015-11-08 01:01+0300\n" "Last-Translator: Pavel Roschin <rpg89(at)post(dot)ru>\n" "Language-Team: Russian <ru(a)li.org>\n" "Language: ru\n" @@ -1574,7 +1574,6 @@ msgid "Follow path of the current file" msgstr "Устанавливать путь вслед за текущим файлом" #: ../data/geany.glade.h:328 -#, fuzzy msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Выполнять ли \"cd $path\", когда вы переключаетесь между открытыми файлами" @@ -2222,7 +2221,6 @@ msgid "Other:" msgstr "Прочие:" #: ../src/about.c:48 -#, fuzzy msgid "" "Copyright (c) 2005-2015\n" "Colomban Wendling\n" @@ -2232,7 +2230,7 @@ msgid "" "Frank Lanitz\n" "All rights reserved." msgstr "" -"Copyright (c) 2005-2014\n" +"Copyright (c) 2005-2015\n" "Colomban Wendling\n" "Nick Treleaven\n" "Matthew Brush\n" @@ -2348,12 +2346,13 @@ msgstr "" "(нажмите Ctrl+C или Enter, чтобы очистить терминал)." #: ../src/build.c:912 -#, fuzzy, c-format +#, c-format msgid "" "Cannot execute terminal command \"%s\": %s. Check the path setting in " "Preferences." msgstr "" -"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках." +"Не могу выполнить команду \"%s\": %s. Проверьте правильность пути в " +"настройках." #: ../src/build.c:1020 msgid "Compilation failed." @@ -2535,19 +2534,17 @@ msgstr "Не удалось открыть файл %s (файл не найде #: ../src/callbacks.c:1473 msgid "Check the path setting in Filetype configuration." -msgstr "" +msgstr "Проверьте правильность пути в настройках типов файлов." #: ../src/callbacks.c:1478 -#, fuzzy msgid "Check the path setting in Preferences." -msgstr "" -"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках." +msgstr "Проверьте правильность пути в настройках." #. G_SHELL_ERROR is parsing error, it may be caused by %s word with quotes #: ../src/callbacks.c:1491 -#, fuzzy, c-format +#, c-format msgid "Cannot execute context action command \"%s\": %s. %s" -msgstr "Не удалось выполнить внешнюю команду '%s' (%s)." +msgstr "Не удалось выполнить команду контекстного действия \"%s\": %s. %s" #: ../src/dialogs.c:160 ../src/document.c:2308 ../src/document.c:2373 #: ../src/document.c:2381 @@ -2798,7 +2795,7 @@ msgstr ", только чтение" #: ../src/document.c:1627 msgid "Discard history" -msgstr "" +msgstr "Сброс истории" #: ../src/document.c:1628 msgid "" @@ -2807,11 +2804,14 @@ msgid "" "will not be displayed again but Your choice can be changed in the various " "preferences." msgstr "" +"Предыдущее состояние буфера находится в истории и отмена действия " +"восстанавливает его. Вы можете отключить данное поведение, выполняя сброс " +"истории при перезагрузке. Данное сообщение не будет отображаться повторно, но " +"ваш выбор может быть изменён в настройках \"Разное\"." #: ../src/document.c:1632 -#, fuzzy msgid "The file has been reloaded." -msgstr "Документ закрыт." +msgstr "Файл был загружен заново." #: ../src/document.c:1662 msgid "Any unsaved changes will be lost." @@ -3920,9 +3920,8 @@ msgid "Switch to Document" msgstr "Перейти к документу" #: ../src/notebook.c:451 -#, fuzzy msgid "Open in New _Window" -msgstr "Открыть в _Geany" +msgstr "Открыть в новом _окне" #: ../src/plugins.c:223 #, c-format @@ -3943,6 +3942,9 @@ msgid "" "<i>Other plugins depend on this. Disable them first to allow deactivation.</" "i>\n" msgstr "" +"\n" +"<i>Этот модуль нужен для работы других. Отключите сначала зависимые модули.</" +"i>\n" #. Four allocations is less than ideal but meh #: ../src/plugins.c:1602 @@ -4111,12 +4113,13 @@ msgstr "" "%s" #: ../src/printing.c:615 -#, fuzzy, c-format +#, c-format msgid "" "Cannot execute print command \"%s\": %s. Check the path setting in " "Preferences." msgstr "" -"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках." +"Не могу запустить команду печати \"%s\": %s. Проверьте правильность пути в " +"настройках." #: ../src/printing.c:622 #, c-format @@ -4464,11 +4467,11 @@ msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (в каталоге: %s)" #: ../src/search.c:1718 -#, fuzzy, c-format +#, c-format msgid "" "Cannot execute grep tool \"%s\": %s. Check the path setting in Preferences." msgstr "" -"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках." +"Не могу запустить утилиту grep \"%s\": %s. Проверьте правильность пути в настройках." #: ../src/search.c:1758 #, c-format @@ -4508,9 +4511,8 @@ msgstr "" "Дальнейшее продолжение работы невозможно." #: ../src/spawn.c:90 ../src/spawn.c:140 ../src/spawn.c:184 -#, fuzzy msgid "Text ended before matching quote was found" -msgstr "Не найдена парная кавычка для %c. (Текст команды: '%s')" +msgstr "Текст команды завершился до того, как была найдена парная кавычка" #. TL note: from glib #: ../src/spawn.c:126 @@ -4523,18 +4525,16 @@ msgstr "" "Экранированная команда Windows должна быть полностью заключена в кавычки" #: ../src/spawn.c:254 -#, fuzzy msgid "Program not found" -msgstr "Команда '%s' не найдена" +msgstr "Программа не найдена" #: ../src/spawn.c:668 -#, fuzzy msgid "Failed to change to the working directory" -msgstr "Ошибка: не указан рабочий каталог" +msgstr "Не удалось сменить рабочий каталог" #: ../src/spawn.c:673 msgid "Unknown error executing child process" -msgstr "" +msgstr "Неизвестная ошибка при запуске дочернего процесса" #: ../src/stash.c:1150 msgid "Name" @@ -4931,6 +4931,8 @@ msgid "" "Cannot execute command \"%s\" from the template: %s. Check the path in the " "template." msgstr "" +"Не удалось запустить команду \"%s\" из шаблона: %s. Проверьте корректность " +"пути в шаблоне." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58 @@ -5106,12 +5108,13 @@ msgid "The executed custom command exited with an unsuccessful exit code." msgstr "Выполненная команда пользователя завершилась с ошибкой." #: ../src/tools.c:242 -#, fuzzy, c-format +#, c-format msgid "" "Cannot execute custom command \"%s\": %s. Check the path setting in Custom " "Commands." msgstr "" -"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках." +"Не удалось выполнить пользовательскую команду \"%s\": %s. Проверьте " +"правильность пути в пользовательских командах." #: ../src/tools.c:357 ../src/tools.c:620 msgid "Set Custom Commands" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2015