diff --git a/doc/manual.html b/doc/manual.html
index 2cfda6689c..452ad91a40 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -475,13 +475,16 @@ <h2 id="api">Programming API</h2>
       <dd>Retrieves the current value of the given option for this
       editor instance.</dd>
 
-      <dt id="cursorCoords"><code>cursorCoords(start) → object</code></dt>
+      <dt id="cursorCoords"><code>cursorCoords(start, mode) → object</code></dt>
       <dd>Returns an <code>{x, y, yBot}</code> object containing the
-      coordinates of the cursor relative to the top-left corner of the
+      coordinates of the cursor. If <code>mode</code>
+      is <code>"local"</code>, they will be relative to the top-left
+      corner of the editable document. If it is <code>"page"</code> or
+      not given, they are relative to the top-left corner of the
       page. <code>yBot</code> is the coordinate of the bottom of the
       cursor. <code>start</code> is a boolean indicating whether you
       want the start or the end of the selection.</dd>
-      <dt id="charCoords"><code>charCoords(pos) → object</code></dt>
+      <dt id="charCoords"><code>charCoords(pos, mode) → object</code></dt>
       <dd>Like <code>cursorCoords</code>, but returns the position of
       an arbitrary characters. <code>pos</code> should be
       a <code>{line, ch}</code> object.</dd>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4536e136ec..d34c3a6e25 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -176,11 +176,16 @@ var CodeMirror = (function() {
         line = clipLine(line == null ? doc.size - 1: line);
         return getStateBefore(line + 1);
       },
-      cursorCoords: function(start){
+      cursorCoords: function(start, mode) {
         if (start == null) start = sel.inverted;
-        return pageCoords(start ? sel.from : sel.to);
+        return this.charCoords(start ? sel.from : sel.to, mode);
+      },
+      charCoords: function(pos, mode) {
+        pos = clipPos(pos);
+        if (mode == "local") return localCoords(pos, false);
+        if (mode == "div") return localCoords(pos, true);
+        return pageCoords(pos);
       },
-      charCoords: function(pos){return pageCoords(clipPos(pos));},
       coordsChar: function(coords) {
         var off = eltOffset(lineSpace);
         return coordsChar(coords.x - off.left, coords.y - off.top);