Merged in changes from CVS head

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-5
   Add =cvs-sync-make-log script

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-6
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-7
   Use absolute tla-tools filenames in =cvs-sync-make-log

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-8
   Use proper arch-tag: syntax for lispintro/texinfo.tex

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-9
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-24

1 files changed, 32 insertions, 0 deletions

diff --git a/src/data.c b/src/data.c
index a246271c1f6..c4e3937f3fa 100644
--- a/src/data.c
+++ b/src/data.c
@@ -873,6 +873,8 @@ store_symval_forwarding (symbol, valcontents, newval, buf)
      register Lisp_Object valcontents, newval;
      struct buffer *buf;
 {
+  int offset;
+
   switch (SWITCH_ENUM_CAST (XTYPE (valcontents)))
     {
     case Lisp_Misc:
@@ -892,6 +894,36 @@ store_symval_forwarding (symbol, valcontents, newval, buf)
 
         case Lisp_Misc_Objfwd:
           *XOBJFWD (valcontents)->objvar = newval;
+
+          /* If this variable is a default for something stored
+             in the buffer itself, such as default-fill-column,
+             find the buffers that don't have local values for it
+             and update them.  */
+          if (XOBJFWD (valcontents)->objvar > (Lisp_Object *) &buffer_defaults
+              && XOBJFWD (valcontents)->objvar < (Lisp_Object *) (&buffer_defaults + 1))
+            {
+              int offset = ((char *) XOBJFWD (valcontents)->objvar
+                            - (char *) &buffer_defaults);
+              int idx = PER_BUFFER_IDX (offset);
+
+              Lisp_Object tail, buf;
+
+              if (idx <= 0)
+                break;
+
+              for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
+                {
+                  Lisp_Object buf;
+                  struct buffer *b;
+
+                  buf = Fcdr (XCAR (tail));
+                  if (!BUFFERP (buf)) continue;
+                  b = XBUFFER (buf);
+
+                  if (! PER_BUFFER_VALUE_P (b, idx))
+                    PER_BUFFER_VALUE (b, offset) = newval;
+                }
+            }
           break;
 
         case Lisp_Misc_Buffer_Objfwd: