From 989e5e7ada29f8e9e36460bc528875f008893226 Mon Sep 17 00:00:00 2001
From: Calvin Fernandez <cfernandez@palantir.com>
Date: Thu, 27 Aug 2015 17:43:24 -0400
Subject: [PATCH] add placholder parameter to work with codemirror placeholder
 addon

---
 codemirror/codemirror.d.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/codemirror/codemirror.d.ts b/codemirror/codemirror.d.ts
index 06361684da..9bf5f3394a 100644
--- a/codemirror/codemirror.d.ts
+++ b/codemirror/codemirror.d.ts
@@ -787,7 +787,10 @@ declare module CodeMirror {
         viewportMargin?: number;
 
         /** Optional lint configuration to be used in conjunction with CodeMirror's linter addon. */
-        lint?: boolean | LintOptions;
+        lint?: boolean | LintOptions;
+
+	/** Optional value to be used in conduction with CodeMirror’s placeholder add-on. */
+	placeholder?: string;
     }
 
     interface TextMarkerOptions {