*** empty log message ***

2 files changed, 10 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 62258f67ff4..00faf92d29a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -166,8 +166,14 @@ its usage.
 
 * Changes in Specialized Modes and Packages in Emacs 23.1
 
-** diff-fine-highlight highlights char-level details of changes in a diff hunk.
+** smerge-refine highlights word-level details of changes in conflict.
+It's used automatically as you move through conflicts, see smerge-auto-refine.
+
+** diff-refine-hunk highlights word-level details of changes in a diff hunk.
+It's used automatically as you move through hunks, see diff-auto-refine.
+
 ** archive-mode has basic support to browse Rar archives.
+
 ** talk.el has been extended for multiple tty support.
 
 ** compilation-auto-jump-to-first-error tells `compile' to jump to
diff --git a/etc/TODO b/etc/TODO
index bea9f39f2a5..a146bbabe2a 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -181,6 +181,8 @@ specified filters, specified timers, and specified hooks.
 
 * Other features we would like:
 
+** Allow frames(terminals) created by emacsclient to inherit their environment
+from the emacsclient process.
 ** Remove the default toggling behavior of minor modes when called from elisp
 rather than interactively.  This a trivial one-liner in easy-mode.el.
 
@@ -609,6 +611,7 @@ but which can also be used as a modifier).
 
 * Other known bugs:
 
+** `make-frame' forgets unhandled parameters, at least for X11 frames.
 ** The \\{...} keymap dump output does not correctly remove shadowed entries:
 From: "Drew Adams" <drew.adams@oracle.com>