# HG changeset patch
# User wenzelm
# Date 1472739175 -7200
# Node ID 300f9782cb6fe3c88063ef75d1aa5d3a5bc24b47
# Parent  9c8a366778e1667a293f6dc09fcc9415ff7f1105
NEWS;

diff -r 9c8a366778e1 -r 300f9782cb6f NEWS
--- a/NEWS	Thu Sep 01 16:05:22 2016 +0200
+++ b/NEWS	Thu Sep 01 16:12:55 2016 +0200
@@ -120,6 +120,13 @@
 occurences of the formal entity at the caret position. This facilitates
 systematic renaming.
 
+* Action "isabelle.keymap-merge" asks the user to resolve pending
+Isabelle keymap changes that are in conflict with the current jEdit
+keymap; non-conflicting changes are always applied implicitly. This
+action is automatically invoked on Isabelle/jEdit startup and thus
+increases chances that users see new keyboard shortcuts when re-using
+old keymaps.
+
 * Document markup works across multiple Isar commands, e.g. the results
 established at the end of a proof are properly identified in the theorem
 statement.