diff options
Diffstat (limited to 'src/nsfns.m')
| -rw-r--r-- | src/nsfns.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index 23362433a39..280fee0b27b 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -1057,7 +1057,7 @@ unwind_create_frame (Lisp_Object frame) | |||
| 1057 | return Qnil; | 1057 | return Qnil; |
| 1058 | 1058 | ||
| 1059 | /* If frame is ``official'', nothing to do. */ | 1059 | /* If frame is ``official'', nothing to do. */ |
| 1060 | if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame)) | 1060 | if (NILP (Fmemq (frame, Vframe_list))) |
| 1061 | { | 1061 | { |
| 1062 | #if GLYPH_DEBUG && XASSERTS | 1062 | #if GLYPH_DEBUG && XASSERTS |
| 1063 | struct ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); | 1063 | struct ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
| @@ -1267,7 +1267,7 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 1267 | #endif | 1267 | #endif |
| 1268 | 1268 | ||
| 1269 | init_frame_faces (f); | 1269 | init_frame_faces (f); |
| 1270 | 1270 | ||
| 1271 | /* The resources controlling the menu-bar and tool-bar are | 1271 | /* The resources controlling the menu-bar and tool-bar are |
| 1272 | processed specially at startup, and reflected in the mode | 1272 | processed specially at startup, and reflected in the mode |
| 1273 | variables; ignore them here. */ | 1273 | variables; ignore them here. */ |
| @@ -1656,7 +1656,7 @@ If omitted or nil, the selected frame's display is used. */) | |||
| 1656 | 1656 | ||
| 1657 | DEFUN ("x-display-backing-store", Fx_display_backing_store, | 1657 | DEFUN ("x-display-backing-store", Fx_display_backing_store, |
| 1658 | Sx_display_backing_store, 0, 1, 0, | 1658 | Sx_display_backing_store, 0, 1, 0, |
| 1659 | doc: /* Return whether the Nexstep display DISPLAY supports backing store. | 1659 | doc: /* Return whether the Nextstep display DISPLAY supports backing store. |
| 1660 | The value may be `buffered', `retained', or `non-retained'. | 1660 | The value may be `buffered', `retained', or `non-retained'. |
| 1661 | DISPLAY should be a frame, the display name as a string, or a terminal ID. | 1661 | DISPLAY should be a frame, the display name as a string, or a terminal ID. |
| 1662 | If omitted or nil, the selected frame's display is used. */) | 1662 | If omitted or nil, the selected frame's display is used. */) |
| @@ -1846,7 +1846,7 @@ DEFUN ("ns-emacs-info-panel", Fns_emacs_info_panel, Sns_emacs_info_panel, | |||
| 1846 | 1846 | ||
| 1847 | 1847 | ||
| 1848 | DEFUN ("ns-font-name", Fns_font_name, Sns_font_name, 1, 1, 0, | 1848 | DEFUN ("ns-font-name", Fns_font_name, Sns_font_name, 1, 1, 0, |
| 1849 | doc: /* Determine font postscript or family name for font NAME. | 1849 | doc: /* Determine font PostScript or family name for font NAME. |
| 1850 | NAME should be a string containing either the font name or an XLFD | 1850 | NAME should be a string containing either the font name or an XLFD |
| 1851 | font descriptor. If string contains `fontset' and not | 1851 | font descriptor. If string contains `fontset' and not |
| 1852 | `fontset-startup', it is left alone. */) | 1852 | `fontset-startup', it is left alone. */) |