From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 21 Jun 2004 03:26:32 +0000 (+0000)
Subject: (Finternal_copy_lisp_face): Small cleanup; doc fix.
X-Git-Tag: ttn-vms-21-2-B4~5701
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e9bab6ff158845a104bcdf8dedf9c7fbe2fbd95;p=emacs.git

(Finternal_copy_lisp_face): Small cleanup; doc fix.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 677bee25aff..17f4490774c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3896,12 +3896,13 @@ Otherwise check for the existence of a global face.  */)
 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.
+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.
 
-Value is TO.  */)
+The value is TO.  */)
      (from, to, frame, new_frame)
      Lisp_Object from, to, frame, new_frame;
 {
@@ -3909,8 +3910,6 @@ Value is TO.  */)
 
   CHECK_SYMBOL (from);
   CHECK_SYMBOL (to);
-  if (NILP (new_frame))
-    new_frame = frame;
 
   if (EQ (frame, Qt))
     {
@@ -3922,6 +3921,8 @@ Value is TO.  */)
   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);