[Emacs-diffs] Changes to emacs/src/xfaces.c [lexbind]

[Miles Bader]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.255.2.14 emacs/src/xfaces.c:1.255.2.15
*** emacs/src/xfaces.c:1.255.2.14       Tue Jul  6 10:10:54 2004
--- emacs/src/xfaces.c  Tue Jul  6 10:17:22 2004
***************
*** 3896,3907 ****
  DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face,
         Sinternal_copy_lisp_face, 4, 4, 0,
         doc: /* Copy face FROM to TO.
! If FRAME is t, copy the global face definition of FROM to the
! global face definition of TO.  Otherwise, copy the frame-local
! definition of FROM on FRAME to the frame-local definition of TO
! on NEW-FRAME, or FRAME if NEW-FRAME is nil.
  
! Value is TO.  */)
       (from, to, frame, new_frame)
       Lisp_Object from, to, frame, new_frame;
  {
--- 3896,3908 ----
  DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face,
         Sinternal_copy_lisp_face, 4, 4, 0,
         doc: /* Copy face FROM to TO.
! If FRAME is t, copy the global face definition of FROM.
! Otherwise, copy the frame-local definition of FROM on FRAME.
! If NEW-FRAME is a frame, copy that data into the frame-local
! definition of TO on NEW-FRAME.  If NEW-FRAME is nil.
! FRAME controls where the data is copied to.
  
! The value is TO.  */)
       (from, to, frame, new_frame)
       Lisp_Object from, to, frame, new_frame;
  {
***************
*** 3909,3916 ****
  
    CHECK_SYMBOL (from);
    CHECK_SYMBOL (to);
-   if (NILP (new_frame))
-     new_frame = frame;
  
    if (EQ (frame, Qt))
      {
--- 3910,3915 ----
***************
*** 3922,3927 ****
--- 3921,3928 ----
    else
      {
        /* Copy frame-local definition of FROM.  */
+       if (NILP (new_frame))
+       new_frame = frame;
        CHECK_LIVE_FRAME (frame);
        CHECK_LIVE_FRAME (new_frame);
        lface = lface_from_face_name (XFRAME (frame), from, 1);