summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Terry <mterry@src.gnome.org>2008-11-16 17:28:03 +0000
committerMichael Terry <mterry@src.gnome.org>2008-11-16 17:28:03 +0000
commit08acc4223943ab2ba49886d12b19f21a999feb18 (patch)
tree3da295ed34d89f495cf50a3e4c9ffca48b4d1219
parent0254ffed9325c74b89eafd97c3258c7f4edce60f (diff)
downloadgedit-08acc4223943ab2ba49886d12b19f21a999feb18.tar.gz
Look at second line as well as first for emacs modeline. Fixes bug #561074.
svn path=/trunk/; revision=6602
-rw-r--r--ChangeLog5
-rw-r--r--plugins/modelines/modeline-parser.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 08931f793..522fc35b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-16 Michael Terry <mike@mterry.name>
+
+ * plugins/modeline/modeline-parser.c: Look at second line as well as first
+ for emacs modelines. Fixes bug #561074.
+
2008-11-03 Paolo Borelli <pborelli@katamail.com>
* gedit/gedit-print-job.c: also get the adjustement from the gtkbuilder
diff --git a/plugins/modelines/modeline-parser.c b/plugins/modelines/modeline-parser.c
index c0ca33345..265bcd384 100644
--- a/plugins/modelines/modeline-parser.c
+++ b/plugins/modelines/modeline-parser.c
@@ -337,7 +337,7 @@ parse_modeline (gchar *s,
while (*s != ':') s++;
s = parse_vim_modeline (s + 1, options);
}
- else if (line_number == 0 && strncmp (s, "-*-", 3) == 0)
+ else if (line_number < 2 && strncmp (s, "-*-", 3) == 0)
{
gedit_debug_message (DEBUG_PLUGINS, "Emacs modeline on line %d", line_number);