[Emacs-diffs] Changes to emacs/src/window.c,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/06/05 03:22:49

Index: window.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/window.c,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -b -r1.612 -r1.613
--- window.c    4 Jun 2008 21:22:33 -0000       1.612
+++ window.c    5 Jun 2008 03:22:48 -0000       1.613
@@ -1329,12 +1329,11 @@
        0, 1, 0,
        doc: /* Return the parameters-alist of window WINDOW.
 It is a list of elements of the form (PARAMETER . VALUE).
-The meaningful PARAMETERs depend on the kind of window.
 If WINDOW is omitted, return information on the currently selected window.  */)
      (window)
      Lisp_Object window;
 {
-  return decode_window (window)->window_parameters;
+  return Fcopy_alist (decode_window (window)->window_parameters);
 }
 
 DEFUN ("window-parameter", Fwindow_parameter, Swindow_parameter,
@@ -1344,7 +1343,10 @@
      (window, parameter)
      Lisp_Object window, parameter;
 {
-  return Fassq (parameter, decode_window (window)->window_parameters);
+  Lisp_Object result;
+
+  result = Fassq (parameter, decode_window (window)->window_parameters);
+  return CDR_SAFE (result);
 }
 
 
@@ -1352,7 +1354,7 @@
        Sset_window_parameter, 3, 3, 0,
        doc: /* Set window parameter PARAMETER to VALUE on WINDOW.
 If WINDOW is nil, use the currently selected window.
-Return the parameters-alist of WINDOW.  */)
+Return VALUE.  */)
      (window, parameter, value)
      Lisp_Object window, parameter, value;
 {
@@ -1364,7 +1366,7 @@
     w->window_parameters = Fcons (Fcons (parameter, value), 
w->window_parameters);
   else
     Fsetcdr (old_alist_elt, value);
-  return w->window_parameters;
+  return value;
 }