From 65f932ba5559d0a6fe2269421637b00c3041d6d1 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@c9.io>
Date: Tue, 7 Apr 2015 09:53:02 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 fix/save-test-2

---
 package.json                          | 2 +-
 plugins/c9.ide.editors/undomanager.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5e1f600b..a969b56d 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
         "c9.ide.run": "#00719ba8fa",
         "c9.ide.run.build": "#915e48b363",
         "c9.ide.run.debug.xdebug": "#b91d23f48b",
-        "c9.ide.save": "#a32a8f4346",
+        "c9.ide.save": "#b876d87d55",
         "c9.ide.terminal.monitor": "#b0b4d03280",
         "c9.ide.theme.flat": "#b1d65fa9bb",
         "c9.ide.threewaymerge": "#229382aa0b",
diff --git a/plugins/c9.ide.editors/undomanager.js b/plugins/c9.ide.editors/undomanager.js
index c88355c2..6ab1adc9 100644
--- a/plugins/c9.ide.editors/undomanager.js
+++ b/plugins/c9.ide.editors/undomanager.js
@@ -99,13 +99,13 @@ define(function(require, module, exports) {
             }
             
             function bookmark(index) {
-                mark = index !== undefined ? index : this.position;
+                mark = index !== undefined ? index : position;
                 
                 emit("change");
             }
             
             function isAtBookmark(){
-                return mark !== null && mark == this.position 
+                return mark !== null && mark == position 
                     || mark === null && position == -1;
             }