Merge from emacs--rel--22

[gnu-emacs] / src / xfns.c

diff --git a/src/xfns.c b/src/xfns.c
index fd59953fe738172e2462e02f31cf0b77e0e6e143..fe4d1c8335f7dda9aebb14fd1249761f41a13f61 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1778,15 +1778,7 @@ x_implicitly_set_name (f, arg, oldval)
 }
 \f
 /* Change the title of frame F to NAME.
-   If NAME is nil, use the frame name as the title.
-
-   If EXPLICIT is non-zero, that indicates that lisp code is setting the
-       name; if NAME is a string, set F's name to NAME and set
-       F->explicit_name; if NAME is Qnil, then clear F->explicit_name.
-
-   If EXPLICIT is zero, that indicates that Emacs redisplay code is
-       suggesting a new name, which lisp code should override; if
-       F->explicit_name is set, ignore the new name; otherwise, set it.  */
+   If NAME is nil, use the frame name as the title.  */
 
 void
 x_set_title (f, name, old_name)