Commits December 2018

commits@lists.geany.org

1 participants
130 discussions

[geany/geany] 992306: Add generic pointer array
by Jiří Techet 17 Dec '18

17 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 06 Oct 2016 13:41:19 UTC Commit: 992306aec3af31868cef702d87bf5d7b99a91112 https://github.com/geany/geany/commit/992306aec3af31868cef702d87bf5d7b99a91… Log Message: ----------- Add generic pointer array Modified Paths: -------------- ctags/Makefile.am ctags/main/ptrarray.c ctags/main/ptrarray.h Modified: ctags/Makefile.am 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -77,6 +77,8 @@ libctags_la_SOURCES = \ main/parse.c \ main/parse.h \ main/parsers.h \ + main/ptrarray.c \ + main/ptrarray.h \ main/read.c \ main/read.h \ main/routines.c \ Modified: ctags/main/ptrarray.c 153 lines changed, 153 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,153 @@ +/* +* Copyright (c) 1999-2002, Darren Hiebert +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* This module contains functions managing resizable pointer arrays. +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <string.h> + +#include "debug.h" +#include "routines.h" +#include "ptrarray.h" + +/* +* DATA DECLARATIONS +*/ + +struct sPtrArray { + unsigned int max; + unsigned int count; + void **array; + ptrArrayDeleteFunc deleteFunc; +}; + +/* +* FUNCTION DEFINITIONS +*/ + +extern ptrArray *ptrArrayNew (ptrArrayDeleteFunc deleteFunc) +{ + ptrArray* const result = xMalloc (1, ptrArray); + result->max = 8; + result->count = 0; + result->array = xMalloc (result->max, void*); + result->deleteFunc = deleteFunc; + return result; +} + +extern void ptrArrayAdd (ptrArray *const current, void *ptr) +{ + Assert (current != NULL); + if (current->count == current->max) + { + current->max *= 2; + current->array = xRealloc (current->array, current->max, void*); + } + current->array [current->count++] = ptr; +} + +extern void ptrArrayRemoveLast (ptrArray *const current) +{ + Assert (current != NULL); + Assert (current->count > 0); + --current->count; +} + +/* Combine array `from' into `current', deleting `from' */ +extern void ptrArrayCombine (ptrArray *const current, ptrArray *const from) +{ + unsigned int i; + Assert (current != NULL); + Assert (from != NULL); + for (i = 0 ; i < from->count ; ++i) + ptrArrayAdd (current, from->array [i]); + from->count = 0; + ptrArrayDelete (from); +} + +extern unsigned int ptrArrayCount (const ptrArray *const current) +{ + Assert (current != NULL); + return current->count; +} + +extern void* ptrArrayItem (const ptrArray *const current, const unsigned int indx) +{ + Assert (current != NULL); + return current->array [indx]; +} + +extern void* ptrArrayLast (const ptrArray *const current) +{ + Assert (current != NULL); + Assert (current->count > 0); + return current->array [current->count - 1]; +} + +extern void ptrArrayClear (ptrArray *const current) +{ + Assert (current != NULL); + if (current->deleteFunc) + { + unsigned int i; + for (i = 0 ; i < current->count ; ++i) + current->deleteFunc (current->array [i]); + } + current->count = 0; +} + +extern void ptrArrayDelete (ptrArray *const current) +{ + if (current != NULL) + { + ptrArrayClear (current); + eFree (current->array); + eFree (current); + } +} + +extern bool ptrArrayHasTest (const ptrArray *const current, + bool (*test)(const void *ptr, void *userData), + void *userData) +{ + bool result = false; + unsigned int i; + Assert (current != NULL); + for (i = 0 ; ! result && i < current->count ; ++i) + result = (*test)(current->array [i], userData); + return result; +} + +extern void ptrArrayReverse (const ptrArray *const current) +{ + unsigned int i, j; + void *tmp; + + Assert (current != NULL); + for (i = 0, j = current->count - 1 ; i < (current->count / 2); ++i, --j) + { + tmp = current->array[i]; + current->array[i] = current->array[j]; + current->array[j] = tmp; + } +} + +extern void ptrArrayDeleteItem (ptrArray* const current, unsigned int indx) +{ + void *ptr = current->array[indx]; + + if (current->deleteFunc) + current->deleteFunc (ptr); + + memmove (current->array + indx, current->array + indx + 1, + (current->count - indx) * sizeof (*current->array)); + --current->count; +} Modified: ctags/main/ptrarray.h 46 lines changed, 46 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,46 @@ +/* +* Copyright (c) 1999-2002, Darren Hiebert +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* Defines external interface to resizable pointer arrays. +*/ +#ifndef CTAGS_MAIN_PTRARRAY_H +#define CTAGS_MAIN_PTRARRAY_H + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +/* +* DATA DECLARATIONS +*/ + +typedef void (*ptrArrayDeleteFunc) (void *data); + +struct sPtrArray; +typedef struct sPtrArray ptrArray; + +/* +* FUNCTION PROTOTYPES +*/ + +extern ptrArray *ptrArrayNew (ptrArrayDeleteFunc deleteFunc); +extern void ptrArrayAdd (ptrArray *const current, void *ptr); +extern void ptrArrayRemoveLast (ptrArray *const current); +extern void ptrArrayCombine (ptrArray *const current, ptrArray *const from); +extern void ptrArrayClear (ptrArray *const current); +extern unsigned int ptrArrayCount (const ptrArray *const current); +extern void* ptrArrayItem (const ptrArray *const current, const unsigned int indx); +extern void* ptrArrayLast (const ptrArray *const current); +extern void ptrArrayDelete (ptrArray *const current); +extern bool ptrArrayHasInsensitive (const ptrArray *const current, const void *const ptr); +extern bool ptrArrayHasTest (const ptrArray *const current, + bool (*test)(const void *ptr, void *userData), + void *userData); +extern void ptrArrayReverse (const ptrArray *const current); +extern void ptrArrayDeleteItem (ptrArray* const current, unsigned int indx); + +#endif /* CTAGS_MAIN_PTRARRAY_H */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 227b80: Grab the complete uctags vString implementation
by Jiří Techet 17 Dec '18

17 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 06 Oct 2016 13:33:24 UTC Commit: 227b8087993505348188fd75f22b9dcd74b50ee8 https://github.com/geany/geany/commit/227b8087993505348188fd75f22b9dcd74b50… Log Message: ----------- Grab the complete uctags vString implementation All the changes in the first half of .c/.h were introduced by me in uctags (and thus they are guaranteed to be great ;-). The following functions were missing in our ctags implementation and are added by this commit (currently unused): extern vString *vStringNewOrClear (vString *const string); extern char *vStringDeleteUnwrap (vString *const string); extern void vStringCatSWithEscaping (vString* b, const char *s); extern void vStringCatSWithEscapingAsPattern (vString *output, const char* input); read.c has been updated to use vStringResize() instead of vStringAutoResize(). Modified Paths: -------------- ctags/main/read.c ctags/main/vstring.c ctags/main/vstring.h Modified: ctags/main/read.c 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -572,11 +572,9 @@ extern char *readLineRaw (vString *const vLine, MIO *const mio) *pLastChar != '\n' && *pLastChar != '\r') { /* buffer overflow */ - reReadLine = vStringAutoResize (vLine); - if (reReadLine) - mio_seek (mio, startOfLine, SEEK_SET); - else - error (FATAL | PERROR, "input line too big; out of memory"); + vStringResize (vLine, vStringSize (vLine) * 2); + mio_seek (mio, startOfLine, SEEK_SET); + reReadLine = true; } else { Modified: ctags/main/vstring.c 214 lines changed, 168 insertions(+), 46 deletions(-) =================================================================== @@ -29,45 +29,33 @@ static const size_t vStringInitialSize = 32; * FUNCTION DEFINITIONS */ -static void vStringResize (vString *const string, const size_t newSize) -{ - char *const newBuffer = xRealloc (string->buffer, newSize, char); - - string->size = newSize; - string->buffer = newBuffer; -} - /* * External interface */ -extern bool vStringAutoResize (vString *const string) +extern void vStringResize (vString *const string, const size_t newSize) { - bool ok = true; + size_t size = vStringInitialSize; - if (string->size <= INT_MAX / 2) - { - const size_t newSize = string->size * 2; + while (size < newSize) + size *= 2; - vStringResize (string, newSize); + if (size > string->size) + { + string->size = size; + string->buffer = xRealloc (string->buffer, size, char); } - return ok; } extern void vStringTruncate (vString *const string, const size_t length) { Assert (length <= string->length); string->length = length; - vStringPut(string, '\0'); + string->buffer[string->length] = '\0'; DebugStatement ( memset (string->buffer + string->length, 0, string->size - string->length); ) } -extern void vStringClear (vString *const string) -{ - vStringTruncate (string, 0); -} - extern void vStringDelete (vString *const string) { if (string != NULL) @@ -95,30 +83,14 @@ extern vString *vStringNew (void) extern void vStringPut (vString *const string, const int c) { if (string->length + 1 == string->size) /* check for buffer overflow */ - vStringAutoResize (string); + vStringResize (string, string->size * 2); string->buffer [string->length] = c; if (c != '\0') string->buffer [++string->length] = '\0'; } #endif -extern void vStringCatS (vString *const string, const char *const s) -{ -#if 1 - const size_t len = strlen (s); - while (string->length + len + 1 >= string->size)/* check for buffer overflow */ - vStringAutoResize (string); - strcpy (string->buffer + string->length, s); - string->length += len; -#else - const char *p = s; - do - vStringPut (string, *p); - while (*p++ != '\0'); -#endif -} - extern vString *vStringNewCopy (const vString *const string) { vString *vs = vStringNew (); @@ -133,25 +105,58 @@ extern vString *vStringNewInit (const char *const s) return vs; } +static void stringCat ( + vString *const string, const char *const s, const size_t length) +{ + if (string->length + length + 1 > string->size) + vStringResize (string, string->length + length + 1); + + strncpy (string->buffer + string->length, s, length); + string->length += length; + vStringPut (string, '\0'); +} + +extern void vStringNCat ( + vString *const string, const vString *const s, const size_t length) +{ + size_t len = vStringLength (s); + + len = len < length ? len: length; + stringCat (string, s->buffer, len); +} + extern void vStringNCatS ( vString *const string, const char *const s, const size_t length) { - const char *p = s; - size_t remain = length; + size_t len = strlen (s); - while (*p != '\0' && remain > 0) - { - vStringPut (string, *p); - --remain; - ++p; - } + len = len < length ? len : length; + stringCat (string, s, len); +} + +extern void vStringCat (vString *const string, const vString *const s) +{ + size_t len = vStringLength (s); + + stringCat (string, s->buffer, len); +} + +extern void vStringCatS (vString *const string, const char *const s) +{ + size_t len = strlen (s); + + stringCat (string, s, len); } /* Strip trailing newline from string. */ extern void vStringStripNewline (vString *const string) { const size_t final = string->length - 1; + + if (string->length == 0) + return; + if (string->buffer [final] == '\n') { string->buffer [final] = '\0'; @@ -196,12 +201,25 @@ extern void vStringChop (vString *const string) } } +extern void vStringCopy (vString *const string, const vString *const s) +{ + vStringClear (string); + vStringCat (string, s); +} + extern void vStringCopyS (vString *const string, const char *const s) { vStringClear (string); vStringCatS (string, s); } +extern void vStringNCopy ( + vString *const string, const vString *const s, const size_t length) +{ + vStringClear (string); + vStringNCat (string, s, length); +} + extern void vStringNCopyS ( vString *const string, const char *const s, const size_t length) { @@ -242,3 +260,107 @@ extern vString *vStringNewOwn (char *s) return r; } + +extern char *vStringDeleteUnwrap (vString *const string) +{ + char *buffer = NULL; + + + if (string != NULL) + { + buffer = string->buffer; + string->buffer = NULL; + + string->size = 0; + string->length = 0; + + eFree (string); + } + + return buffer; +} + +static char valueToXDigit (int v) +{ + Assert (v >= 0 && v <= 0xF); + + if (v >= 0xA) + return 'A' + (v - 0xA); + else + return '0' + v; +} + +extern void vStringCatSWithEscaping (vString* b, const char *s) +{ + for(; *s; s++) + { + int c = *s; + + /* escape control characters (incl. \t) */ + if ((c > 0x00 && c <= 0x1F) || c == 0x7F || c == '\\') + { + vStringPut (b, '\\'); + + switch (c) + { + /* use a short form for known escapes */ + case '\a': + c = 'a'; break; + case '\b': + c = 'b'; break; + case '\t': + c = 't'; break; + case '\n': + c = 'n'; break; + case '\v': + c = 'v'; break; + case '\f': + c = 'f'; break; + case '\r': + c = 'r'; break; + case '\\': + c = '\\'; break; + default: + vStringPut (b, 'x'); + vStringPut (b, valueToXDigit ((c & 0xF0) >> 4)); + vStringPut (b, valueToXDigit (c & 0x0F)); + continue; + } + } + vStringPut (b, c); + } +} + +extern void vStringCatSWithEscapingAsPattern (vString *output, const char* input) +{ + while (*input) + { + switch (*input) + { + case '\\': + vStringPut(output, '\\'); + vStringPut(output, '\\'); + break; + case '/': + vStringPut(output, '\\'); + vStringPut(output, '/'); + break; + default: + vStringPut(output, *input); + break; + + } + input++; + } +} + +extern vString *vStringNewOrClear (vString *const string) +{ + if (string) + { + vStringClear (string); + return string; + } + else + return vStringNew (); +} Modified: ctags/main/vstring.h 29 lines changed, 22 insertions(+), 7 deletions(-) =================================================================== @@ -18,6 +18,10 @@ # include <stdlib.h> /* to define size_t */ #endif +#include <stdio.h> + +#include "mio.h" + /* * MACROS */ @@ -26,7 +30,7 @@ #endif #ifdef VSTRING_PUTC_MACRO #define vStringPut(s,c) \ - (void)(((s)->length + 1 == (s)->size ? vStringAutoResize (s) : 0), \ + (void)(((s)->length + 1 == (s)->size ? vStringResize ((s), (s)->size * 2) : 0), \ ((s)->buffer [(s)->length] = (c)), \ ((c) == '\0' ? 0 : ((s)->buffer [++(s)->length] = '\0'))) #endif @@ -36,13 +40,15 @@ #define vStringLast(vs) ((vs)->buffer[(vs)->length - 1]) #define vStringLength(vs) ((vs)->length) #define vStringSize(vs) ((vs)->size) -#define vStringCat(vs,s) vStringCatS((vs), vStringValue((s))) -#define vStringNCat(vs,s,l) vStringNCatS((vs), vStringValue((s)), (l)) -#define vStringCopy(vs,s) vStringCopyS((vs), vStringValue((s))) -#define vStringNCopy(vs,s,l) vStringNCopyS((vs), vStringValue((s)), (l)) #define vStringChar(vs,i) ((vs)->buffer[i]) #define vStringLower(vs) toLowerString((vs)->buffer) #define vStringUpper(vs) toUpperString((vs)->buffer) +#define vStringClear(string) \ + do { \ + vString *vStringClear_s = (string); \ + vStringClear_s->length = 0; \ + vStringClear_s->buffer[0] = '\0'; \ + } while (false) /* * DATA DECLARATIONS @@ -57,8 +63,7 @@ typedef struct sVString { /* * FUNCTION PROTOTYPES */ -extern bool vStringAutoResize (vString *const string); -extern void vStringClear (vString *const string); +extern void vStringResize (vString *const string, const size_t newSize); extern vString *vStringNew (void); extern void vStringDelete (vString *const string); #ifndef VSTRING_PUTC_MACRO @@ -68,16 +73,26 @@ extern void vStringStripNewline (vString *const string); extern void vStringStripLeading (vString *const string); extern void vStringChop (vString *const string); extern void vStringStripTrailing (vString *const string); +extern void vStringCat (vString *const string, const vString *const s); extern void vStringCatS (vString *const string, const char *const s); +extern void vStringNCat (vString *const string, const vString *const s, const size_t length); extern void vStringNCatS (vString *const string, const char *const s, const size_t length); extern vString *vStringNewCopy (const vString *const string); extern vString *vStringNewInit (const char *const s); +extern void vStringCopy (vString *const string, const vString *const s); extern void vStringCopyS (vString *const string, const char *const s); +extern void vStringNCopy (vString *const string, const vString *const s, const size_t length); extern void vStringNCopyS (vString *const string, const char *const s, const size_t length); extern void vStringCopyToLower (vString *const dest, const vString *const src); extern void vStringSetLength (vString *const string); extern void vStringTruncate (vString *const string, const size_t length); +extern vString *vStringNewOrClear (vString *const string); + extern vString *vStringNewOwn (char *s); +extern char *vStringDeleteUnwrap (vString *const string); + +extern void vStringCatSWithEscaping (vString* b, const char *s); +extern void vStringCatSWithEscapingAsPattern (vString *output, const char* input); #endif /* CTAGS_MAIN_VSTRING_H */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 5024d7: Go simple with LANG determination
by Jiří Techet 17 Dec '18

17 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 05 Jul 2018 15:28:39 UTC Commit: 5024d7dcbdcf9848e667e88e0fbacfe5046706c5 https://github.com/geany/geany-osx/commit/5024d7dcbdcf9848e667e88e0fbacfe50… Log Message: ----------- Go simple with LANG determination AppleLocale is set based on the country set in the "region" settings and territory based on the first language in the "preferred languages" settings. In general, this should be enough to set LANG and other language-related environment variables for Geany. The current script does complicated things to determine LANG but the result isn't correct in all cases. LANG isn't set correctly in cases where country doesn't correspond to the territory language. For instance, when country is set to "cs" and territory to "DK", we get "cs_DK" but for this combination no locale is found because it's under the "cs_CZ" directory and because of this the language falls back into "en_US". Instead of doing fancy stuff, let's just set LANG and all the related environment variables to the contents of AppleLocale and add the "UTF-8" extension. GTK will get the best locale language for us and if nothing is found, it falls back to English. And VTE will always get a valid LANG settings. Modified Paths: -------------- launcher-gtk2.sh launcher-gtk3.sh Modified: launcher-gtk2.sh 128 lines changed, 6 insertions(+), 122 deletions(-) =================================================================== @@ -56,132 +56,16 @@ export PANGO_LIBDIR="$bundle_lib" export PANGO_SYSCONFDIR="$bundle_etc" if test -e ~/.config/geany/ignore_locale; then - export LANG="en_US" - export LC_MESSAGES="en_US" - export LC_ALL="en_US.UTF-8" + export LANG="en_US.UTF-8" else - -APP=$name -I18NDIR="$bundle_data/locale" -# Set the locale-related variables appropriately: -unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE - -# Has a language ordering been set? -# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it. -# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the chinese scripts from "Hans" to CN and "Hant" to TW. -APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En -e 's/\-/_/' -e 's/Hant/TW/' -e 's/Hans/CN/' -e 's/[[:space:]]*\"?([[:alnum:]_]+)\"?,?/\1/p' ` -if test "$APPLELANGUAGES"; then - # A language ordering exists. - # Test, item per item, to see whether there is an corresponding locale. - for L in $APPLELANGUAGES; do - #test for exact matches: - if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then - export LANG=$L - break - fi - #This is a special case, because often the original strings are in US - #English and there is no translation file. - if test "x$L" == "xen_US"; then - export LANG=$L - break - fi - #OK, now test for just the first two letters: - if test -f "$I18NDIR/${L:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=$L - break - fi - #Same thing, but checking for any english variant. - if test "x${L:0:2}" == "xen"; then - export LANG=$L - break - fi; - done -fi -unset APPLELANGUAGES L - -if test -n ${LANG}; then + export LANG=`defaults read .GlobalPreferences AppleLocale` export LANG="${LANG}.UTF-8" fi -# If we didn't get a language from the language list, try the Collation preference, in case it's the only setting that exists. -APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder` -if test -z ${LANG} -a -n $APPLECOLLATION; then - if test -f "$I18NDIR/${APPLECOLLATION:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=${APPLECOLLATION:0:2} - fi -fi -if test ! -z $APPLECOLLATION; then - export LC_COLLATE=$APPLECOLLATION -fi -unset APPLECOLLATION - -# Continue by attempting to find the Locale preference. -APPLELOCALE=`defaults read .GlobalPreferences AppleLocale` - -if test -f "$I18NDIR/${APPLELOCALE:0:5}/LC_MESSAGES/$APP.mo"; then - if test -z $LANG; then - export LANG="${APPLELOCALE:0:5}" - fi - -elif test -z $LANG -a -f "$I18NDIR/${APPLELOCALE:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG="${APPLELOCALE:0:2}" -fi - -#Next we need to set LC_MESSAGES. If at all possilbe, we want a full -#5-character locale to avoid the "Locale not supported by C library" -#warning from Gtk -- even though Gtk will translate with a -#two-character code. -if test -n $LANG; then -#If the language code matches the applelocale, then that's the message -#locale; otherwise, if it's longer than two characters, then it's -#probably a good message locale and we'll go with it. - if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then - export LC_MESSAGES=$LANG -#Next try if the Applelocale is longer than 2 chars and the language -#bit matches $LANG - elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then - export LC_MESSAGES=${APPLELOCALE:0:5} -#Fail. Get a list of the locales in $PREFIX/share/locale that match -#our two letter language code and pick the first one, special casing -#english to set en_US - elif test $LANG == "en"; then - export LC_MESSAGES="en_US" - else - LOC=`find $PREFIX/share/locale -name $LANG???` - for L in $LOC; do - export LC_MESSAGES=$L - done - fi -else -#All efforts have failed, so default to US english - export LANG="en_US" - export LC_MESSAGES="en_US" -fi -CURRENCY=`echo $APPLELOCALE | sed -En 's/.*currency=([[:alpha:]]+).*/\1/p'` -if test "x$CURRENCY" != "x"; then -#The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in /usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to. - if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then - if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then - export LC_MONETARY=$LC_MESSAGES - fi - fi - if test -z "$LC_MONETARY"; then - FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;` - if test -n "$FILES"; then - export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/([[:alpha:]_]+)/LC_MONETARY.*%\1%p'` - fi - fi -fi -#No currency value means that the AppleLocale governs: -if test -z "$LC_MONETARY"; then - LC_MONETARY=${APPLELOCALE:0:5} -fi -#For Gtk, which only looks at LC_ALL: -export LC_ALL=$LC_MESSAGES - -unset APPLELOCALE FILES LOC - -fi #ignore_locale +export LC_MESSAGES=$LANG +export LC_MONETARY=$LANG +export LC_COLLATE=$LANG +export LC_ALL=$LANG if test -f "$bundle_lib/charset.alias"; then export CHARSETALIASDIR="$bundle_lib" Modified: launcher-gtk3.sh 128 lines changed, 6 insertions(+), 122 deletions(-) =================================================================== @@ -56,132 +56,16 @@ if [ `uname -r | cut -d . -f 1` -ge 10 ]; then fi if test -e ~/.config/geany/ignore_locale; then - export LANG="en_US" - export LC_MESSAGES="en_US" - export LC_ALL="en_US.UTF-8" + export LANG="en_US.UTF-8" else - -APP=$name -I18NDIR="$bundle_data/locale" -# Set the locale-related variables appropriately: -unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE - -# Has a language ordering been set? -# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it. -# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the chinese scripts from "Hans" to CN and "Hant" to TW. -APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En -e 's/\-/_/' -e 's/Hant/TW/' -e 's/Hans/CN/' -e 's/[[:space:]]*\"?([[:alnum:]_]+)\"?,?/\1/p' ` -if test "$APPLELANGUAGES"; then - # A language ordering exists. - # Test, item per item, to see whether there is an corresponding locale. - for L in $APPLELANGUAGES; do - #test for exact matches: - if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then - export LANG=$L - break - fi - #This is a special case, because often the original strings are in US - #English and there is no translation file. - if test "x$L" == "xen_US"; then - export LANG=$L - break - fi - #OK, now test for just the first two letters: - if test -f "$I18NDIR/${L:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=$L - break - fi - #Same thing, but checking for any english variant. - if test "x${L:0:2}" == "xen"; then - export LANG=$L - break - fi; - done -fi -unset APPLELANGUAGES L - -if test -n ${LANG}; then + export LANG=`defaults read .GlobalPreferences AppleLocale` export LANG="${LANG}.UTF-8" fi -# If we didn't get a language from the language list, try the Collation preference, in case it's the only setting that exists. -APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder` -if test -z ${LANG} -a -n $APPLECOLLATION; then - if test -f "$I18NDIR/${APPLECOLLATION:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=${APPLECOLLATION:0:2} - fi -fi -if test ! -z $APPLECOLLATION; then - export LC_COLLATE=$APPLECOLLATION -fi -unset APPLECOLLATION - -# Continue by attempting to find the Locale preference. -APPLELOCALE=`defaults read .GlobalPreferences AppleLocale` - -if test -f "$I18NDIR/${APPLELOCALE:0:5}/LC_MESSAGES/$APP.mo"; then - if test -z $LANG; then - export LANG="${APPLELOCALE:0:5}" - fi - -elif test -z $LANG -a -f "$I18NDIR/${APPLELOCALE:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG="${APPLELOCALE:0:2}" -fi - -#Next we need to set LC_MESSAGES. If at all possilbe, we want a full -#5-character locale to avoid the "Locale not supported by C library" -#warning from Gtk -- even though Gtk will translate with a -#two-character code. -if test -n $LANG; then -#If the language code matches the applelocale, then that's the message -#locale; otherwise, if it's longer than two characters, then it's -#probably a good message locale and we'll go with it. - if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then - export LC_MESSAGES=$LANG -#Next try if the Applelocale is longer than 2 chars and the language -#bit matches $LANG - elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then - export LC_MESSAGES=${APPLELOCALE:0:5} -#Fail. Get a list of the locales in $PREFIX/share/locale that match -#our two letter language code and pick the first one, special casing -#english to set en_US - elif test $LANG == "en"; then - export LC_MESSAGES="en_US" - else - LOC=`find $PREFIX/share/locale -name $LANG???` - for L in $LOC; do - export LC_MESSAGES=$L - done - fi -else -#All efforts have failed, so default to US english - export LANG="en_US" - export LC_MESSAGES="en_US" -fi -CURRENCY=`echo $APPLELOCALE | sed -En 's/.*currency=([[:alpha:]]+).*/\1/p'` -if test "x$CURRENCY" != "x"; then -#The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in /usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to. - if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then - if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then - export LC_MONETARY=$LC_MESSAGES - fi - fi - if test -z "$LC_MONETARY"; then - FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;` - if test -n "$FILES"; then - export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/([[:alpha:]_]+)/LC_MONETARY.*%\1%p'` - fi - fi -fi -#No currency value means that the AppleLocale governs: -if test -z "$LC_MONETARY"; then - LC_MONETARY=${APPLELOCALE:0:5} -fi -#For Gtk, which only looks at LC_ALL: -export LC_ALL=$LC_MESSAGES - -unset APPLELOCALE FILES LOC - -fi #ignore_locale +export LC_MESSAGES=$LANG +export LC_MONETARY=$LANG +export LC_COLLATE=$LANG +export LC_ALL=$LANG if test -f "$bundle_lib/charset.alias"; then export CHARSETALIASDIR="$bundle_lib" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 5024d7: Go simple with LANG determination
by Jiří Techet 16 Dec '18

16 Dec '18

Branch: refs/tags/1.34.0 Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 05 Jul 2018 15:28:39 UTC Commit: 5024d7dcbdcf9848e667e88e0fbacfe5046706c5 https://github.com/geany/geany-osx/commit/5024d7dcbdcf9848e667e88e0fbacfe50… Log Message: ----------- Go simple with LANG determination AppleLocale is set based on the country set in the "region" settings and territory based on the first language in the "preferred languages" settings. In general, this should be enough to set LANG and other language-related environment variables for Geany. The current script does complicated things to determine LANG but the result isn't correct in all cases. LANG isn't set correctly in cases where country doesn't correspond to the territory language. For instance, when country is set to "cs" and territory to "DK", we get "cs_DK" but for this combination no locale is found because it's under the "cs_CZ" directory and because of this the language falls back into "en_US". Instead of doing fancy stuff, let's just set LANG and all the related environment variables to the contents of AppleLocale and add the "UTF-8" extension. GTK will get the best locale language for us and if nothing is found, it falls back to English. And VTE will always get a valid LANG settings. Modified Paths: -------------- launcher-gtk2.sh launcher-gtk3.sh Modified: launcher-gtk2.sh 128 lines changed, 6 insertions(+), 122 deletions(-) =================================================================== @@ -56,132 +56,16 @@ export PANGO_LIBDIR="$bundle_lib" export PANGO_SYSCONFDIR="$bundle_etc" if test -e ~/.config/geany/ignore_locale; then - export LANG="en_US" - export LC_MESSAGES="en_US" - export LC_ALL="en_US.UTF-8" + export LANG="en_US.UTF-8" else - -APP=$name -I18NDIR="$bundle_data/locale" -# Set the locale-related variables appropriately: -unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE - -# Has a language ordering been set? -# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it. -# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the chinese scripts from "Hans" to CN and "Hant" to TW. -APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En -e 's/\-/_/' -e 's/Hant/TW/' -e 's/Hans/CN/' -e 's/[[:space:]]*\"?([[:alnum:]_]+)\"?,?/\1/p' ` -if test "$APPLELANGUAGES"; then - # A language ordering exists. - # Test, item per item, to see whether there is an corresponding locale. - for L in $APPLELANGUAGES; do - #test for exact matches: - if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then - export LANG=$L - break - fi - #This is a special case, because often the original strings are in US - #English and there is no translation file. - if test "x$L" == "xen_US"; then - export LANG=$L - break - fi - #OK, now test for just the first two letters: - if test -f "$I18NDIR/${L:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=$L - break - fi - #Same thing, but checking for any english variant. - if test "x${L:0:2}" == "xen"; then - export LANG=$L - break - fi; - done -fi -unset APPLELANGUAGES L - -if test -n ${LANG}; then + export LANG=`defaults read .GlobalPreferences AppleLocale` export LANG="${LANG}.UTF-8" fi -# If we didn't get a language from the language list, try the Collation preference, in case it's the only setting that exists. -APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder` -if test -z ${LANG} -a -n $APPLECOLLATION; then - if test -f "$I18NDIR/${APPLECOLLATION:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=${APPLECOLLATION:0:2} - fi -fi -if test ! -z $APPLECOLLATION; then - export LC_COLLATE=$APPLECOLLATION -fi -unset APPLECOLLATION - -# Continue by attempting to find the Locale preference. -APPLELOCALE=`defaults read .GlobalPreferences AppleLocale` - -if test -f "$I18NDIR/${APPLELOCALE:0:5}/LC_MESSAGES/$APP.mo"; then - if test -z $LANG; then - export LANG="${APPLELOCALE:0:5}" - fi - -elif test -z $LANG -a -f "$I18NDIR/${APPLELOCALE:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG="${APPLELOCALE:0:2}" -fi - -#Next we need to set LC_MESSAGES. If at all possilbe, we want a full -#5-character locale to avoid the "Locale not supported by C library" -#warning from Gtk -- even though Gtk will translate with a -#two-character code. -if test -n $LANG; then -#If the language code matches the applelocale, then that's the message -#locale; otherwise, if it's longer than two characters, then it's -#probably a good message locale and we'll go with it. - if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then - export LC_MESSAGES=$LANG -#Next try if the Applelocale is longer than 2 chars and the language -#bit matches $LANG - elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then - export LC_MESSAGES=${APPLELOCALE:0:5} -#Fail. Get a list of the locales in $PREFIX/share/locale that match -#our two letter language code and pick the first one, special casing -#english to set en_US - elif test $LANG == "en"; then - export LC_MESSAGES="en_US" - else - LOC=`find $PREFIX/share/locale -name $LANG???` - for L in $LOC; do - export LC_MESSAGES=$L - done - fi -else -#All efforts have failed, so default to US english - export LANG="en_US" - export LC_MESSAGES="en_US" -fi -CURRENCY=`echo $APPLELOCALE | sed -En 's/.*currency=([[:alpha:]]+).*/\1/p'` -if test "x$CURRENCY" != "x"; then -#The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in /usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to. - if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then - if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then - export LC_MONETARY=$LC_MESSAGES - fi - fi - if test -z "$LC_MONETARY"; then - FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;` - if test -n "$FILES"; then - export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/([[:alpha:]_]+)/LC_MONETARY.*%\1%p'` - fi - fi -fi -#No currency value means that the AppleLocale governs: -if test -z "$LC_MONETARY"; then - LC_MONETARY=${APPLELOCALE:0:5} -fi -#For Gtk, which only looks at LC_ALL: -export LC_ALL=$LC_MESSAGES - -unset APPLELOCALE FILES LOC - -fi #ignore_locale +export LC_MESSAGES=$LANG +export LC_MONETARY=$LANG +export LC_COLLATE=$LANG +export LC_ALL=$LANG if test -f "$bundle_lib/charset.alias"; then export CHARSETALIASDIR="$bundle_lib" Modified: launcher-gtk3.sh 128 lines changed, 6 insertions(+), 122 deletions(-) =================================================================== @@ -56,132 +56,16 @@ if [ `uname -r | cut -d . -f 1` -ge 10 ]; then fi if test -e ~/.config/geany/ignore_locale; then - export LANG="en_US" - export LC_MESSAGES="en_US" - export LC_ALL="en_US.UTF-8" + export LANG="en_US.UTF-8" else - -APP=$name -I18NDIR="$bundle_data/locale" -# Set the locale-related variables appropriately: -unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE - -# Has a language ordering been set? -# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it. -# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the chinese scripts from "Hans" to CN and "Hant" to TW. -APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En -e 's/\-/_/' -e 's/Hant/TW/' -e 's/Hans/CN/' -e 's/[[:space:]]*\"?([[:alnum:]_]+)\"?,?/\1/p' ` -if test "$APPLELANGUAGES"; then - # A language ordering exists. - # Test, item per item, to see whether there is an corresponding locale. - for L in $APPLELANGUAGES; do - #test for exact matches: - if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then - export LANG=$L - break - fi - #This is a special case, because often the original strings are in US - #English and there is no translation file. - if test "x$L" == "xen_US"; then - export LANG=$L - break - fi - #OK, now test for just the first two letters: - if test -f "$I18NDIR/${L:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=$L - break - fi - #Same thing, but checking for any english variant. - if test "x${L:0:2}" == "xen"; then - export LANG=$L - break - fi; - done -fi -unset APPLELANGUAGES L - -if test -n ${LANG}; then + export LANG=`defaults read .GlobalPreferences AppleLocale` export LANG="${LANG}.UTF-8" fi -# If we didn't get a language from the language list, try the Collation preference, in case it's the only setting that exists. -APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder` -if test -z ${LANG} -a -n $APPLECOLLATION; then - if test -f "$I18NDIR/${APPLECOLLATION:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG=${APPLECOLLATION:0:2} - fi -fi -if test ! -z $APPLECOLLATION; then - export LC_COLLATE=$APPLECOLLATION -fi -unset APPLECOLLATION - -# Continue by attempting to find the Locale preference. -APPLELOCALE=`defaults read .GlobalPreferences AppleLocale` - -if test -f "$I18NDIR/${APPLELOCALE:0:5}/LC_MESSAGES/$APP.mo"; then - if test -z $LANG; then - export LANG="${APPLELOCALE:0:5}" - fi - -elif test -z $LANG -a -f "$I18NDIR/${APPLELOCALE:0:2}/LC_MESSAGES/$APP.mo"; then - export LANG="${APPLELOCALE:0:2}" -fi - -#Next we need to set LC_MESSAGES. If at all possilbe, we want a full -#5-character locale to avoid the "Locale not supported by C library" -#warning from Gtk -- even though Gtk will translate with a -#two-character code. -if test -n $LANG; then -#If the language code matches the applelocale, then that's the message -#locale; otherwise, if it's longer than two characters, then it's -#probably a good message locale and we'll go with it. - if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then - export LC_MESSAGES=$LANG -#Next try if the Applelocale is longer than 2 chars and the language -#bit matches $LANG - elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then - export LC_MESSAGES=${APPLELOCALE:0:5} -#Fail. Get a list of the locales in $PREFIX/share/locale that match -#our two letter language code and pick the first one, special casing -#english to set en_US - elif test $LANG == "en"; then - export LC_MESSAGES="en_US" - else - LOC=`find $PREFIX/share/locale -name $LANG???` - for L in $LOC; do - export LC_MESSAGES=$L - done - fi -else -#All efforts have failed, so default to US english - export LANG="en_US" - export LC_MESSAGES="en_US" -fi -CURRENCY=`echo $APPLELOCALE | sed -En 's/.*currency=([[:alpha:]]+).*/\1/p'` -if test "x$CURRENCY" != "x"; then -#The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in /usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to. - if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then - if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then - export LC_MONETARY=$LC_MESSAGES - fi - fi - if test -z "$LC_MONETARY"; then - FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;` - if test -n "$FILES"; then - export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/([[:alpha:]_]+)/LC_MONETARY.*%\1%p'` - fi - fi -fi -#No currency value means that the AppleLocale governs: -if test -z "$LC_MONETARY"; then - LC_MONETARY=${APPLELOCALE:0:5} -fi -#For Gtk, which only looks at LC_ALL: -export LC_ALL=$LC_MESSAGES - -unset APPLELOCALE FILES LOC - -fi #ignore_locale +export LC_MESSAGES=$LANG +export LC_MONETARY=$LANG +export LC_COLLATE=$LANG +export LC_ALL=$LANG if test -f "$bundle_lib/charset.alias"; then export CHARSETALIASDIR="$bundle_lib" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4641ce: Remove an unnecessary local variable
by Colomban Wendling 16 Dec '18

16 Dec '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 15 Jun 2018 20:37:13 UTC Commit: 4641ce3e9ff5574eb2a9268451198733aad46ea2 https://github.com/geany/geany/commit/4641ce3e9ff5574eb2a9268451198733aad46… Log Message: ----------- Remove an unnecessary local variable Modified Paths: -------------- src/editor.c Modified: src/editor.c 10 lines changed, 4 insertions(+), 6 deletions(-) =================================================================== @@ -3116,7 +3116,7 @@ void editor_do_comment_toggle(GeanyEditor *editor) gint count_commented = 0, count_uncommented = 0; gchar sel[256]; const gchar *co, *cc; - gboolean break_loop = FALSE, single_line = FALSE; + gboolean single_line = FALSE; gboolean first_line_was_comment = FALSE; gboolean last_line_was_comment = FALSE; gsize co_len; @@ -3148,7 +3148,7 @@ void editor_do_comment_toggle(GeanyEditor *editor) sci_start_undo_action(editor->sci); - for (i = first_line; (i <= last_line) && (! break_loop); i++) + for (i = first_line; i <= last_line; i++) { gint buf_len; @@ -3208,7 +3208,6 @@ void editor_do_comment_toggle(GeanyEditor *editor) } /* break because we are already on the last line */ - break_loop = TRUE; break; } } @@ -3287,7 +3286,7 @@ gint editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line gint count = 0; gchar sel[256]; const gchar *co, *cc; - gboolean break_loop = FALSE, single_line = FALSE; + gboolean single_line = FALSE; GeanyFiletype *ft; g_return_val_if_fail(editor != NULL && editor->document->file_type != NULL, 0); @@ -3320,7 +3319,7 @@ gint editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line sci_start_undo_action(editor->sci); - for (i = first_line; (i <= last_line) && (! break_loop); i++) + for (i = first_line; i <= last_line; i++) { gint buf_len; @@ -3372,7 +3371,6 @@ gint editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line count = 1; /* break because we are already on the last line */ - break_loop = TRUE; break; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 99851b: Remove unused parameter
by Colomban Wendling 16 Dec '18

16 Dec '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 15 Jun 2018 21:06:10 UTC Commit: 99851b592a77d06229cc1b5a14d89c3db347a268 https://github.com/geany/geany/commit/99851b592a77d06229cc1b5a14d89c3db347a… Log Message: ----------- Remove unused parameter Since 320e4b9d762e0bd7d550c62be614873db5a04ac4 the "smart line indentation" explicitly doesn't restore cursor position, and doesn't make use of the position parameter, which no caller really use anyway. Remove it altogether to avoid confusion. Modified Paths: -------------- src/editor.c src/editor.h src/keybindings.c Modified: src/editor.c 5 lines changed, 1 insertions(+), 4 deletions(-) =================================================================== @@ -3931,7 +3931,7 @@ static void smart_line_indentation(GeanyEditor *editor, gint first_line, gint la /* simple indentation to indent the current line with the same indent as the previous one */ -void editor_smart_line_indentation(GeanyEditor *editor, gint pos) +void editor_smart_line_indentation(GeanyEditor *editor) { gint first_line, last_line; gint first_sel_start, first_sel_end; @@ -3949,9 +3949,6 @@ void editor_smart_line_indentation(GeanyEditor *editor, gint pos) last_line = sci_get_line_from_position(sci, first_sel_end - editor_get_eol_char_len(editor)); last_line = MAX(first_line, last_line); - if (pos == -1) - pos = first_sel_start; - sci_start_undo_action(sci); smart_line_indentation(editor, first_line, last_line); Modified: src/editor.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -258,7 +258,7 @@ void editor_insert_alternative_whitespace(GeanyEditor *editor); void editor_indent(GeanyEditor *editor, gboolean increase); -void editor_smart_line_indentation(GeanyEditor *editor, gint pos); +void editor_smart_line_indentation(GeanyEditor *editor); void editor_indentation_by_one_space(GeanyEditor *editor, gint pos, gboolean decrease); Modified: src/keybindings.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2489,7 +2489,7 @@ static gboolean cb_func_format_action(guint key_id) editor_indentation_by_one_space(doc->editor, -1, TRUE); break; case GEANY_KEYS_FORMAT_AUTOINDENT: - editor_smart_line_indentation(doc->editor, -1); + editor_smart_line_indentation(doc->editor); break; case GEANY_KEYS_FORMAT_TOGGLECASE: on_toggle_case1_activate(NULL, NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 46ee2a: Report subroutine declarations as such
by Colomban Wendling 16 Dec '18

16 Dec '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 15 Jun 2018 20:17:12 UTC Commit: 46ee2a826f47abc2335040af8ec4a0cde13c6b8f https://github.com/geany/geany/commit/46ee2a826f47abc2335040af8ec4a0cde13c6… Log Message: ----------- Report subroutine declarations as such They were reported as subroutines because kind was assigned after being used, which was likely a bug. Modified Paths: -------------- ctags/parsers/perl.c Modified: ctags/parsers/perl.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -324,6 +324,7 @@ static void findPerlTags (void) if (true == isSubroutineDeclaration(cp)) { if (true == PerlKinds[K_SUBROUTINE_DECLARATION].enabled) { kind = K_SUBROUTINE_DECLARATION; + e.kind = &(PerlKinds[kind]); } else { vStringClear (name); continue; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 40fc67: Add a sanity check on the Save As callback
by Colomban Wendling 16 Dec '18

16 Dec '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 15 Jun 2018 20:34:57 UTC Commit: 40fc6775a38c15699e30823c9ab204e1b555908d https://github.com/geany/geany/commit/40fc6775a38c15699e30823c9ab204e1b5559… Log Message: ----------- Add a sanity check on the Save As callback Add a defensive check to make sure to catch the unlikely but maybe theoretically possible case where the document last document is closed while the Save As dialog is running. Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -492,6 +492,7 @@ static gboolean handle_save_as(const gchar *utf8_filename, gboolean rename_file) GeanyDocument *doc = document_get_current(); gboolean success = FALSE; + g_return_val_if_fail(doc != NULL, FALSE); g_return_val_if_fail(!EMPTY(utf8_filename), FALSE); if (doc->file_name != NULL) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b6fe9f: Merge pull request #1878 from b4n/issue-1876
by Colomban Wendling 16 Dec '18

16 Dec '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 16 Dec 2018 17:55:06 UTC Commit: b6fe9f17aeae40ab48e73481e618877e65db464b https://github.com/geany/geany/commit/b6fe9f17aeae40ab48e73481e618877e65db4… Log Message: ----------- Merge pull request #1878 from b4n/issue-1876 Various fixes reported in #1876 Modified Paths: -------------- ctags/parsers/perl.c src/dialogs.c src/editor.c src/editor.h src/keybindings.c Modified: ctags/parsers/perl.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -324,6 +324,7 @@ static void findPerlTags (void) if (true == isSubroutineDeclaration(cp)) { if (true == PerlKinds[K_SUBROUTINE_DECLARATION].enabled) { kind = K_SUBROUTINE_DECLARATION; + e.kind = &(PerlKinds[kind]); } else { vStringClear (name); continue; Modified: src/dialogs.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -492,6 +492,7 @@ static gboolean handle_save_as(const gchar *utf8_filename, gboolean rename_file) GeanyDocument *doc = document_get_current(); gboolean success = FALSE; + g_return_val_if_fail(doc != NULL, FALSE); g_return_val_if_fail(!EMPTY(utf8_filename), FALSE); if (doc->file_name != NULL) Modified: src/editor.c 15 lines changed, 5 insertions(+), 10 deletions(-) =================================================================== @@ -3115,7 +3115,7 @@ void editor_do_comment_toggle(GeanyEditor *editor) gint count_commented = 0, count_uncommented = 0; gchar sel[256]; const gchar *co, *cc; - gboolean break_loop = FALSE, single_line = FALSE; + gboolean single_line = FALSE; gboolean first_line_was_comment = FALSE; gboolean last_line_was_comment = FALSE; gsize co_len; @@ -3147,7 +3147,7 @@ void editor_do_comment_toggle(GeanyEditor *editor) sci_start_undo_action(editor->sci); - for (i = first_line; (i <= last_line) && (! break_loop); i++) + for (i = first_line; i <= last_line; i++) { gint buf_len; @@ -3207,7 +3207,6 @@ void editor_do_comment_toggle(GeanyEditor *editor) } /* break because we are already on the last line */ - break_loop = TRUE; break; } } @@ -3286,7 +3285,7 @@ gint editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line gint count = 0; gchar sel[256]; const gchar *co, *cc; - gboolean break_loop = FALSE, single_line = FALSE; + gboolean single_line = FALSE; GeanyFiletype *ft; g_return_val_if_fail(editor != NULL && editor->document->file_type != NULL, 0); @@ -3319,7 +3318,7 @@ gint editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line sci_start_undo_action(editor->sci); - for (i = first_line; (i <= last_line) && (! break_loop); i++) + for (i = first_line; i <= last_line; i++) { gint buf_len; @@ -3371,7 +3370,6 @@ gint editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line count = 1; /* break because we are already on the last line */ - break_loop = TRUE; break; } } @@ -3932,7 +3930,7 @@ static void smart_line_indentation(GeanyEditor *editor, gint first_line, gint la /* simple indentation to indent the current line with the same indent as the previous one */ -void editor_smart_line_indentation(GeanyEditor *editor, gint pos) +void editor_smart_line_indentation(GeanyEditor *editor) { gint first_line, last_line; gint first_sel_start, first_sel_end; @@ -3950,9 +3948,6 @@ void editor_smart_line_indentation(GeanyEditor *editor, gint pos) last_line = sci_get_line_from_position(sci, first_sel_end - editor_get_eol_char_len(editor)); last_line = MAX(first_line, last_line); - if (pos == -1) - pos = first_sel_start; - sci_start_undo_action(sci); smart_line_indentation(editor, first_line, last_line); Modified: src/editor.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -258,7 +258,7 @@ void editor_insert_alternative_whitespace(GeanyEditor *editor); void editor_indent(GeanyEditor *editor, gboolean increase); -void editor_smart_line_indentation(GeanyEditor *editor, gint pos); +void editor_smart_line_indentation(GeanyEditor *editor); void editor_indentation_by_one_space(GeanyEditor *editor, gint pos, gboolean decrease); Modified: src/keybindings.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2491,7 +2491,7 @@ static gboolean cb_func_format_action(guint key_id) editor_indentation_by_one_space(doc->editor, -1, TRUE); break; case GEANY_KEYS_FORMAT_AUTOINDENT: - editor_smart_line_indentation(doc->editor, -1); + editor_smart_line_indentation(doc->editor); break; case GEANY_KEYS_FORMAT_TOGGLECASE: on_toggle_case1_activate(NULL, NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 784d72: Update version number
by Jiří Techet 16 Dec '18

16 Dec '18

Branch: refs/tags/1.34.0 Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 16 Dec 2018 17:09:34 UTC Commit: 784d722c3e1dbb594fff072a3048a527e86728b9 https://github.com/geany/geany-osx/commit/784d722c3e1dbb594fff072a3048a527e… Log Message: ----------- Update version number Modified Paths: -------------- Info.plist create_dmg.sh geany.modules Modified: Info.plist 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -3,11 +3,11 @@ <plist version="1.0"> <dict> <key>CFBundleShortVersionString</key> - <string>1.33</string> + <string>1.34</string> <key>CFBundleVersion</key> - <string>1.33</string> + <string>1.34</string> <key>CFBundleGetInfoString</key> - <string>1.33 (C) 2018 The Geany Team, http://www.geany.org</string> + <string>1.34 (C) 2018 The Geany Team, https://www.geany.org</string> <key>NSHumanReadableCopyright</key> <string>Copyright 2018 The Geany Team, GNU General Public License</string> Modified: create_dmg.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,6 @@ #!/bin/sh -VERSION="1.33" +VERSION="1.34" NAME="Geany" ICONNAME="Geany.icns" Modified: geany.modules 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -155,7 +155,7 @@ <branch repo="download.geany.org" module="geany-${version}.tar.bz2" checkoutdir="geany-release" - version="1.33"/> + version="1.34"/> <dependencies> <dep package="geany-deps-gtk2" /> </dependencies> @@ -167,7 +167,7 @@ <branch repo="download.geany.org" module="geany-${version}.tar.bz2" checkoutdir="geany-release" - version="1.33"/> + version="1.34"/> <dependencies> <dep package="geany-deps-gtk3" /> </dependencies> @@ -212,7 +212,7 @@ <branch repo="download.geany.org" module="geany-plugins/geany-plugins-${version}.tar.bz2" checkoutdir="geany-plugins-release" - version="1.33"/> + version="1.34"/> <dependencies> <dep package="geany-release-gtk2" /> <dep package="geany-plugins-deps" /> @@ -224,7 +224,7 @@ <branch repo="download.geany.org" module="geany-plugins/geany-plugins-${version}.tar.bz2" checkoutdir="geany-plugins-release" - version="1.33"/> + version="1.34"/> <dependencies> <dep package="geany-release-gtk3" /> <dep package="geany-plugins-deps" /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2018