Merge from emacs-23.

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e196b3015bd04056e64910e9cebaff7b43941fbd..7dcf00ba81eba3cb9b513d640fa7bd2f65a6a228 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-25  Chong Yidong  <cyd@stupidchicken.com>
+            Richard Kim  <emacs18@gmail.com>
+
+       * loading.texi (Library Search): Document list-load-path-shadows
+       (Bug#7757).
+
+2011-01-25  Chong Yidong  <cyd@stupidchicken.com>
+
+       * searching.texi (Regexp Special): Remove outdated discussion of
+       character sets (Bug#7780).
+
+       * frames.texi (Pop-Up Menus): Document where menu title comes
+       from (Bug#7684).
+
+2011-01-25  Glenn Morris  <rgm@gnu.org>
+
+       * display.texi (Making Buttons): Mention limitation of text buttons.
+
 2011-01-23  Werner Lemberg  <wl@gnu.org>
 
        * Makefile.in (MAKEINFO): Now controlled by `configure'.