diff options
| author | Martin Rudalics | 2007-10-12 08:49:20 +0000 |
|---|---|---|
| committer | Martin Rudalics | 2007-10-12 08:49:20 +0000 |
| commit | 40aa4c27cb7cac7ef2ff7a88c504cc2ae42da194 (patch) | |
| tree | 5eab8ea94a26997b3c468719af4a9516683b7488 /src | |
| parent | 5839d7e85ca7596071d459595f194f45027535df (diff) | |
| download | emacs-40aa4c27cb7cac7ef2ff7a88c504cc2ae42da194.tar.gz emacs-40aa4c27cb7cac7ef2ff7a88c504cc2ae42da194.zip | |
(set-frame-configuration): Assign name parameter only
if it has been set explicitly before.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macfns.c | 10 | ||||
| -rw-r--r-- | src/w32fns.c | 10 | ||||
| -rw-r--r-- | src/xfns.c | 10 |
3 files changed, 3 insertions, 27 deletions
diff --git a/src/macfns.c b/src/macfns.c index 8dff77cd5fd..1139158f165 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -1855,15 +1855,7 @@ x_implicitly_set_name (f, arg, oldval) | |||
| 1855 | } | 1855 | } |
| 1856 | 1856 | ||
| 1857 | /* Change the title of frame F to NAME. | 1857 | /* Change the title of frame F to NAME. |
| 1858 | If NAME is nil, use the frame name as the title. | 1858 | If NAME is nil, use the frame name as the title. */ |
| 1859 | |||
| 1860 | If EXPLICIT is non-zero, that indicates that lisp code is setting the | ||
| 1861 | name; if NAME is a string, set F's name to NAME and set | ||
| 1862 | F->explicit_name; if NAME is Qnil, then clear F->explicit_name. | ||
| 1863 | |||
| 1864 | If EXPLICIT is zero, that indicates that Emacs redisplay code is | ||
| 1865 | suggesting a new name, which lisp code should override; if | ||
| 1866 | F->explicit_name is set, ignore the new name; otherwise, set it. */ | ||
| 1867 | 1859 | ||
| 1868 | void | 1860 | void |
| 1869 | x_set_title (f, name, old_name) | 1861 | x_set_title (f, name, old_name) |
diff --git a/src/w32fns.c b/src/w32fns.c index d260b0d9be9..e8a2dc913de 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -1937,15 +1937,7 @@ x_implicitly_set_name (f, arg, oldval) | |||
| 1937 | } | 1937 | } |
| 1938 | 1938 | ||
| 1939 | /* Change the title of frame F to NAME. | 1939 | /* Change the title of frame F to NAME. |
| 1940 | If NAME is nil, use the frame name as the title. | 1940 | If NAME is nil, use the frame name as the title. */ |
| 1941 | |||
| 1942 | If EXPLICIT is non-zero, that indicates that lisp code is setting the | ||
| 1943 | name; if NAME is a string, set F's name to NAME and set | ||
| 1944 | F->explicit_name; if NAME is Qnil, then clear F->explicit_name. | ||
| 1945 | |||
| 1946 | If EXPLICIT is zero, that indicates that Emacs redisplay code is | ||
| 1947 | suggesting a new name, which lisp code should override; if | ||
| 1948 | F->explicit_name is set, ignore the new name; otherwise, set it. */ | ||
| 1949 | 1941 | ||
| 1950 | void | 1942 | void |
| 1951 | x_set_title (f, name, old_name) | 1943 | x_set_title (f, name, old_name) |
diff --git a/src/xfns.c b/src/xfns.c index 80f21411890..13672736849 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1764,15 +1764,7 @@ x_implicitly_set_name (f, arg, oldval) | |||
| 1764 | } | 1764 | } |
| 1765 | 1765 | ||
| 1766 | /* Change the title of frame F to NAME. | 1766 | /* Change the title of frame F to NAME. |
| 1767 | If NAME is nil, use the frame name as the title. | 1767 | If NAME is nil, use the frame name as the title. */ |
| 1768 | |||
| 1769 | If EXPLICIT is non-zero, that indicates that lisp code is setting the | ||
| 1770 | name; if NAME is a string, set F's name to NAME and set | ||
| 1771 | F->explicit_name; if NAME is Qnil, then clear F->explicit_name. | ||
| 1772 | |||
| 1773 | If EXPLICIT is zero, that indicates that Emacs redisplay code is | ||
| 1774 | suggesting a new name, which lisp code should override; if | ||
| 1775 | F->explicit_name is set, ignore the new name; otherwise, set it. */ | ||
| 1776 | 1768 | ||
| 1777 | void | 1769 | void |
| 1778 | x_set_title (f, name, old_name) | 1770 | x_set_title (f, name, old_name) |