aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS6
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 11c4f7cb7a8..5ebc7ac5ddc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -454,6 +454,12 @@ This is enabled if isearch-buffers-multi is non-nil.
454*** The part of an isearch that failed to match is highlighted in `isearch-fail' 454*** The part of an isearch that failed to match is highlighted in `isearch-fail'
455face. 455face.
456 456
457*** `C-h C-h' in isearch mode displays isearch-specific Help screen,
458`C-h b' displays all isearch key bindings, `C-h k' displays the full
459documentation of the given isearch key sequence, `C-h m' displays
460documentation of isearch mode. All the rest Help commands exit isearch mode
461and execute their global definitions.
462
457** smerge-refine highlights word-level details of changes in conflict. 463** smerge-refine highlights word-level details of changes in conflict.
458It's used automatically as you move through conflicts, see smerge-auto-refine. 464It's used automatically as you move through conflicts, see smerge-auto-refine.
459 465