Branch: refs/heads/document-messages
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 26 Dec 2011 14:30:07
Commit: 59e84666edd915485f4f6369d08d358000454f52
https://github.com/geany/geany/commit/59e84666edd915485f4f6369d08d358000454…
Log Message:
-----------
Update HACKING to suggest MIO_FORCE_ANSI for building with -ansi
Modified Paths:
--------------
HACKING
Modified: HACKING
3 files changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -169,6 +169,9 @@ to set warning options (as well as anything else e.g. -g -O2).
use C ``/* */`` comments and function_name(void) instead of
function_name(). This is for compatibility with various Unix-like
compilers. You should use -ansi to help check this.
+ Note that MIO (tagmanager/mio) requires ``MIO_FORCE_ANSI``
+ preprocessor constant to be defined to build with ``-ansi``, so you
+ should add ``-DMIO_FORCE_ANSI`` together with ``-ansi``.
.. tip::
Remember for gcc you need to enable optimization to get certain
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/document-messages
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 26 Dec 2011 14:30:07
Commit: d76d72518a5c46acd5dc142d1f627d30978875eb
https://github.com/geany/geany/commit/d76d72518a5c46acd5dc142d1f627d3097887…
Log Message:
-----------
Import upstream MIO changes
Modified Paths:
--------------
tagmanager/mio/mio.c
tagmanager/mio/mio.h
Modified: tagmanager/mio/mio.c
35 files changed, 35 insertions(+), 0 deletions(-)
===================================================================
@@ -18,6 +18,16 @@
*
*/
+/* Hack to force ANSI compliance by not using va_copy() even if present.
+ * This relies on the fact G_VA_COPY is maybe defined as va_copy in
+ * glibconfig.h, so we undef it, but gutils.h takes care of defining a
+ * compiler-specific implementation if not already defined.
+ * This needs to come before any other GLib inclusion. */
+#ifdef MIO_FORCE_ANSI
+# include <glibconfig.h>
+# undef G_VA_COPY
+#endif
+
#include "mio.h"
#include "mio-file.c"
#include "mio-memory.c"
@@ -31,6 +41,31 @@
/**
+ * SECTION:mio
+ * @short_description: The MIO object
+ * @include: mio/mio.h
+ *
+ * The #MIO object replicates the C file I/O API with support of both standard
+ * file based operations and in-memory operations. Its goal is to ease the port
+ * of an application that uses C file I/O API to perform in-memory operations.
+ *
+ * A #MIO object is created using mio_new_file() or mio_new_memory(), depending
+ * on whether you want file or in-memory operations, and destroyed using
+ * mio_free(). There is also some other convenient API to create file-based
+ * #MIO objects for more complex cases, such as mio_new_file_full() and
+ * mio_new_fp().
+ *
+ * Once the #MIO object is created, you can perform standard I/O operations on
+ * it transparently without the need to care about the effective underlying
+ * operations.
+ *
+ * The I/O API is almost exactly a replication of the standard C file I/O API
+ * with the significant difference that the first parameter is always the #MIO
+ * object to work on.
+ */
+
+
+/**
* mio_new_file_full:
* @filename: Filename to open, passed as-is to @open_func as the first argument
* @mode: Mode in which open the file, passed as-is to @open_func as the second
Modified: tagmanager/mio/mio.h
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -93,7 +93,7 @@ struct _MIOPos {
#endif
union {
fpos_t file;
- size_t mem;
+ gsize mem;
} impl;
};
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/document-messages
Author: Matthew Brush <matt(a)geany.org>
Committer: Matthew Brush <matt(a)geany.org>
Date: Mon, 26 Dec 2011 00:40:18
Commit: f3af82d40df3503495445c4f25bf7cbeda6d839e
https://github.com/geany/geany/commit/f3af82d40df3503495445c4f25bf7cbeda6d8…
Log Message:
-----------
Handle failure of reading named style by trying to read it as a named color
TODO: find a better way to handle this and restore the removed warning
Modified Paths:
--------------
src/highlighting.c
Modified: src/highlighting.c
31 files changed, 15 insertions(+), 16 deletions(-)
===================================================================
@@ -271,26 +271,25 @@ static void parse_keyfile_style(GKeyFile *kf, gchar **list,
len = g_strv_length(list);
str = list[0];
+
+ /* It might be a named style so try and parse it as such */
if (len == 1 && isalpha(str[0]))
{
- if (!read_named_style(str, style))
- geany_debug(
- "No named style '%s'! Check filetype styles or %s color scheme.",
- str, NVL(editor_prefs.color_scheme, "filetypes.common"));
+ if (read_named_style(str, style))
+ return;
+ /* It must start with a named color (or error), fall through */
}
- else
+
+ switch (len)
{
- switch (len)
- {
- case 4:
- style->italic = utils_atob(list[3]);
- case 3:
- style->bold = utils_atob(list[2]);
- case 2:
- parse_color(kf, list[1], &style->background);
- case 1:
- parse_color(kf, list[0], &style->foreground);
- }
+ case 4:
+ style->italic = utils_atob(list[3]);
+ case 3:
+ style->bold = utils_atob(list[2]);
+ case 2:
+ parse_color(kf, list[1], &style->background);
+ case 1:
+ parse_color(kf, list[0], &style->foreground);
}
}
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).