aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2011-02-09 23:04:56 -0800
committerPaul Eggert2011-02-09 23:04:56 -0800
commitbe6d99804b3efdecf3660c4b51da1945e955fb4d (patch)
tree99b523c445f7b95572ab668f4e878cd703ff3527 /etc
parentdd4638842ad1921562bc66049ec81a4530651cdf (diff)
parent67f02b82f496be403353a1dc918cc4f2278841bb (diff)
downloademacs-be6d99804b3efdecf3660c4b51da1945e955fb4d.tar.gz
emacs-be6d99804b3efdecf3660c4b51da1945e955fb4d.zip
Merge from mainline.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 020aa2f26a0..11425c21342 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -562,9 +562,9 @@ listing object name completions when being sent text via
562 562
563** sregex.el is now obsolete, since rx.el is a strict superset. 563** sregex.el is now obsolete, since rx.el is a strict superset.
564 564
565** s-region.el is now declared obsolete, superceded by shift-select-mode 565** s-region.el and pc-select are now declared obsolete,
566enabled by default in 23.1. 566superceded by shift-select-mode enabled by default in 23.1.
567 567** pc-mode.el is also declared obsolete.
568** gdb-mi 568** gdb-mi
569 569
570*** GDB User Interface migrated to GDB Machine Interface and now 570*** GDB User Interface migrated to GDB Machine Interface and now