Merge from trunk.

1 files changed, 82 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index da3cc91a675..6d6ddf4da9a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,85 @@
+2012-11-13  Glenn Morris  <rgm@gnu.org>
+
+        * variables.texi (Adding Generalized Variables):
+        At least mention gv-define-expander and gv-letplace.
+
+        * debugging.texi (Error Debugging): Mention debug-on-message.
+        (Using Debugger): Mention debugger-bury-or-kill.
+
+        * control.texi (Signaling Errors):
+        * debugging.texi (Error Debugging):
+        * errors.texi (Standard Errors): Add user-error.
+
+        * variables.texi (Adding Generalized Variables):
+        Use standard formatting for common lisp note about setf functions.
+
+2012-11-10  Martin Rudalics  <rudalics@gmx.at>
+
+        * elisp.texi (Top): Add Recombining Windows to menu.
+        * windows.texi (Recombining Windows): New subsection.
+        (Splitting Windows): Rewrite text on handling of window
+        combinations and move it to new subsection.
+
+2012-11-10  Chong Yidong  <cyd@gnu.org>
+
+        * searching.texi (Replacing Match): Document \? in replace-match.
+
+        * variables.texi (Creating Buffer-Local): Document setq-local and
+        defvar-local.
+        (Setting Generalized Variables): Arrange table alphabetically.
+
+        * lists.texi (List Elements, List Variables): Clarify descriptions
+        of push and pop for generalized variables.
+
+        * edebug.texi (Specification List): setf is no longer CL-only.
+
+2012-11-10  Glenn Morris  <rgm@gnu.org>
+
+        * variables.texi (Adding Generalized Variables):
+        Update description of FIX-RETURN expansion.
+
+        * variables.texi (Setting Generalized Variables):
+        Split most of previous contents into this subsection.
+        (Adding Generalized Variables): New subsection.
+        Move note on lack of setf functions here from misc/cl.texi.
+
+        * elisp.texi: Add Generalized Variables subsections to detailed menu.
+
+2012-11-10  Chong Yidong  <cyd@gnu.org>
+
+        * frames.texi (Initial Parameters): Doc fix (Bug#12144).
+
+2012-11-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * os.texi (Notifications): Update descriptions of
+        notifications-notify, notifications-close-notification and
+        notifications-get-capabilities according to latest code changes.
+        Add notifications-get-server-information.
+
+2012-11-03  Chong Yidong  <cyd@gnu.org>
+
+        * objects.texi (General Escape Syntax): Clarify the explanation of
+        escape sequences.
+        (Non-ASCII in Strings): Clarify when a string is unibyte vs
+        multibyte.  Hex escapes do not automatically make a string
+        multibyte.
+
+2012-11-03  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Switching Buffers): Document option
+        switch-to-buffer-preserve-window-point.
+        (Display Action Functions): Document window-height and
+        window-width alist entries.
+        (Display Action Functions): Document
+        display-buffer-below-selected and
+        display-buffer-in-previous-window.
+        (Quitting Windows): Document quit-restore-window.  Rewrite
+        section.
+        (Window Configurations): In window-state-get mention that
+        argument window must be valid.
+        (Window Parameters): Document quit-restore window parameter
+        (Bug#12158).
+
 2012-10-31  Glenn Morris  <rgm@gnu.org>
 
         * control.texi (Catch and Throw): Add xref to cl.texi.