From 147e5f17917936d65252cd7b6a87200e7bff39ab Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Sun, 19 Dec 2010 00:08:09 -0800
Subject: [PATCH] Don't confuse doc and view

---
 doc/user-tools.texi           | 2 +-
 moo/mooedit/mooedit-fileops.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/user-tools.texi b/doc/user-tools.texi
index a848257e..632a264f 100644
--- a/doc/user-tools.texi
+++ b/doc/user-tools.texi
@@ -237,6 +237,6 @@ the number of the line containing cursor.
 the user data directory. For example the tools are stored in @file{$DATA_DIR/menu.cfg} file and in files in the @file{$DATA_DIR/tools/} directory.
 @end table
 
-Additionally, all processes ran from inside @medit{} will have @file{DATADIR/scripts}
+Additionally, all shell commands which run inside @medit{} will have @file{DATADIR/scripts}
 directories in @code{$PATH}, so you may place some @medit{}-specific programs
 or scripts into @file{USERDATADIR/scripts/} to be used from shell script tools.
diff --git a/moo/mooedit/mooedit-fileops.c b/moo/mooedit/mooedit-fileops.c
index 18a5e786..556395ae 100644
--- a/moo/mooedit/mooedit-fileops.c
+++ b/moo/mooedit/mooedit-fileops.c
@@ -745,10 +745,12 @@ moo_edit_reload_local (MooEdit    *edit,
     GtkTextBuffer *buffer;
     gboolean result, enable_highlight;
     GFile *file;
+    MooEditView *view;
 
     file = moo_edit_get_file (edit);
     moo_return_val_if_fail (G_IS_FILE (file), FALSE);
 
+    view = moo_edit_get_view (edit);
     buffer = moo_edit_get_buffer (edit);
 
     block_buffer_signals (edit);
@@ -756,15 +758,15 @@ moo_edit_reload_local (MooEdit    *edit,
 
     gtk_text_buffer_get_bounds (buffer, &start, &end);
     gtk_text_buffer_delete (buffer, &start, &end);
-    g_object_get (edit, "enable-highlight", &enable_highlight, (char*) 0);
-    g_object_set (edit, "enable-highlight", FALSE, (char*) 0);
+    g_object_get (view, "enable-highlight", &enable_highlight, (char*) 0);
+    g_object_set (view, "enable-highlight", FALSE, (char*) 0);
 
     result = _moo_edit_load_file (edit, file,
                                   encoding ? encoding : edit->priv->encoding,
                                   NULL,
                                   error);
 
-    g_object_set (edit, "enable-highlight", enable_highlight, (char*) 0);
+    g_object_set (view, "enable-highlight", enable_highlight, (char*) 0);
     gtk_text_buffer_end_user_action (buffer);
     unblock_buffer_signals (edit);