2 files changed, 73 insertions, 4 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 1b9aabffe46..f591037daab 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,53 @@
+2003-12-29  Richard M. Stallman  <rms@gnu.org>
+
+        * windows.texi (Choosing Window): Add same-window-p, special-display-p.
+        (Window Configurations): Add window-configuration-frame.
+
+        * variables.texi (Creating Buffer-Local): Add local-variable-if-set-p.
+
+        * text.texi (Examining Properties): Add get-char-property-and-overlay.
+        Change arg name in get-char-property.
+        (Special Properties): Update handling of keymap property.
+
+        * strings.texi (Modifying Strings): Add clear-string.
+        (Text Comparison): Add assoc-string and remove
+        assoc-ignore-case, assoc-ignore-representation.
+
+        * os.texi (Time of Day): Add set-time-zone-rule.
+
+        * numbers.texi (Math Functions): asin, acos, log, log10
+        report domain-error errors.     
+
+        * nonascii.texi (Converting Representations): 
+        Add multibyte-char-to-unibyte and unibyte-char-to-multibyte.
+        (Encoding and I/O): Add file-name-coding-system.
+
+        * modes.texi (Search-based Fontification): Explain that
+        face specs are symbols with face names as values.
+
+        * minibuf.texi (Minibuffer Misc): Add set-minibuffer-window.
+
+        * lists.texi (Building Lists): remq moved elsewhere.
+        (Sets And Lists): remq moved here.
+        (Association Lists): Refer to assoc-string.
+
+        * internals.texi (Garbage Collection): Add memory-use-counts.
+
+        * frames.texi (Frames and Windows): Add set-frame-selected-window
+        and frame-root-window.
+
+        * files.texi (Contents of Directories): 
+        Add directory-files-and-attributes.
+
+        * display.texi (Refresh Screen): Add force-window-update.
+        (Invisible Text): Explain about moving point out of invis text.
+        (Overlay Properties): Add overlay-properties.
+        (Managing Overlays): Add overlayp.
+        (GIF Images): Invalid image number displays a hollow box.
+
+        * buffers.texi (Buffer Modification): Add restore-buffer-modified-p.
+        (Killing Buffers): Add buffer-live-p.
+
 2003-12-25  Markus Rost  <rost@mathematik.uni-bielefeld.de>
 
         * display.texi (Fringes): Fix typo "set-buffer-window".
diff --git a/lispref/windows.texi b/lispref/windows.texi
index 158ab354057..425d5601ec9 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -1027,6 +1027,14 @@ list is the regular expression, and the rest of the list says how to
 create the frame.  See above, under @code{special-display-buffer-names}.
 @end defopt
 
+@defun special-display-p buffer-name
+This function returns non-@code{nil} if displaying a buffer
+named @var{buffer-name} with @code{display-buffer} would
+create a special frame.  The value is @code{t} if it would
+use the default frame paramaters, or else the specified list
+of frame parameters.
+@end defun
+
 @defvar special-display-function
 This variable holds the function to call to display a buffer specially.
 It receives the buffer as an argument, and should return the window in
@@ -1075,6 +1083,12 @@ the regular expressions in this list, @code{display-buffer} handles the
 buffer by switching to it in the selected window.
 @end defopt
 
+@defun same-window-p buffer-name
+This function returns @code{t} if displaying a buffer
+named @var{buffer-name} with @code{display-buffer} would
+put it in the selected window.
+@end defun
+
 @c Emacs 19 feature
 @defvar display-buffer-function
 This variable is the most flexible way to customize the behavior of
@@ -2163,10 +2177,15 @@ regards configurations as unequal if they differ in any respect, even a
 saved point or mark.
 @end defun
 
-  Primitives to look inside of window configurations would make sense,
-but none are implemented.  It is not clear they are useful enough to
-be worth implementing.  See the file @file{winner.el} for some more
-operations on windows configurations.
+@defun window-configuration-frame config
+This function returns the frame for which the window configuration
+@var{config} was made.
+@end defun
+
+  Other primitives to look inside of window configurations would make
+sense, but are not implemented because we did not need them.  See the
+file @file{winner.el} for some more operations on windows
+configurations.
 
 @node Window Hooks
 @section Hooks for Window Scrolling and Changes