From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 15 Jun 2015 05:24:03 +0000 (-0700)
Subject: ; Omit mistaken update
X-Git-Tag: emacs-25.0.90~1764
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a281b3db3e1ac83f80db78ea1a5069069dd91942;p=emacs.git

; Omit mistaken update
---

diff --git a/ChangeLog.2 b/ChangeLog.2
index 5935503abc9..b8e1e38a586 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,10 +1,3 @@
-2015-06-14  Christoph Wedler  <christoph.wedler@sap.com>
-
-	Some generic support for multi-mode indentation.
-	* lisp/progmodes/prog-mode.el (prog-indentation-context): New
-	variable.
-	(prog-first-column, prog-widen): New convenience functions.
-
 2015-06-13  Glenn Morris  <rgm@gnu.org>
 
 	Tweaks for getting repository version; a bit more like it was for bzr.