From daae45054c7011a1df5d7ba5e7bf75f245fde1ea Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Tue, 2 Nov 2010 12:57:10 +0000 Subject: [PATCH] Only automatically replace characters when the current document is a Markup document. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5353 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 3 +++ plugins/htmlchars.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index de5b90ff8..a8a6b8b7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * src/plugindata.h, src/plugins.c, plugins/geanyfunctions.h: Add sci_get_lexer() to plugin API. + * plugins/htmlchars.c: + Only automatically replace characters when the current document is + a Markup document. 2010-11-01 Nick Treleaven diff --git a/plugins/htmlchars.c b/plugins/htmlchars.c index 043e7b906..18751dc2e 100644 --- a/plugins/htmlchars.c +++ b/plugins/htmlchars.c @@ -27,6 +27,7 @@ #include "geanyplugin.h" #include +#include "SciLexer.h" GeanyData *geany_data; @@ -376,7 +377,7 @@ static void set_status(gboolean new_status) g_free(config_dir); g_key_file_free(config); } -} +} static void toggle_status(G_GNUC_UNUSED GtkMenuItem * menuitem) @@ -422,11 +423,17 @@ static const gchar *get_entity(gchar *letter) static gboolean ht_editor_notify_cb(GObject *object, GeanyEditor *editor, SCNotification *nt, gpointer data) { + gint lexer; + g_return_val_if_fail(editor != NULL, FALSE); - if (plugin_active != TRUE) + if (!plugin_active) return FALSE; + lexer = sci_get_lexer(editor->sci); + if (lexer != SCLEX_HTML && lexer != SCLEX_XML) + return FALSE; + if (nt->nmhdr.code == SCN_CHARADDED) { gchar buf[7]; -- 2.11.4.GIT