Mercurial > emacs
comparison src/w32fns.c @ 90197:b7da78284d4c
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-65
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 425-445)
- Remove "-face" suffix from gnus faces
- Update from CVS
- Remove "-face" suffix from MH-E faces
- Remove "-face" suffix from cc-mode faces
- Remove "-face" suffix from eshell faces
- Remove "-face" suffix from ediff faces
- Implement tty vertical-divider face
- Rename vertical-divider face to vertical-border
- Change escape-glyph color on dark backgrounds back to cyan
- Update reference to renamed Buffer-menu-buffer face
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 24 Jun 2005 01:59:52 +0000 |
parents | a1b34dec1104 426ba3ecedd7 |
children | bb71c6cf2009 |
comparison
equal
deleted
inserted
replaced
90196:82d495f87e7b | 90197:b7da78284d4c |
---|---|
328 if (NILP (frame)) | 328 if (NILP (frame)) |
329 frame = selected_frame; | 329 frame = selected_frame; |
330 CHECK_LIVE_FRAME (frame); | 330 CHECK_LIVE_FRAME (frame); |
331 f = XFRAME (frame); | 331 f = XFRAME (frame); |
332 if (! FRAME_W32_P (f)) | 332 if (! FRAME_W32_P (f)) |
333 error ("non-w32 frame used"); | 333 error ("Non-W32 frame used"); |
334 return f; | 334 return f; |
335 } | 335 } |
336 | 336 |
337 /* Let the user specify a display with a frame. | 337 /* Let the user specify a display with a frame. |
338 nil stands for the selected frame--or, if that is not a w32 frame, | 338 nil stands for the selected frame--or, if that is not a w32 frame, |
358 FRAME_PTR f; | 358 FRAME_PTR f; |
359 | 359 |
360 CHECK_LIVE_FRAME (frame); | 360 CHECK_LIVE_FRAME (frame); |
361 f = XFRAME (frame); | 361 f = XFRAME (frame); |
362 if (! FRAME_W32_P (f)) | 362 if (! FRAME_W32_P (f)) |
363 error ("non-w32 frame used"); | 363 error ("Non-W32 frame used"); |
364 return FRAME_W32_DISPLAY_INFO (f); | 364 return FRAME_W32_DISPLAY_INFO (f); |
365 } | 365 } |
366 } | 366 } |
367 | 367 |
368 /* Return the Emacs frame-object corresponding to an w32 window. | 368 /* Return the Emacs frame-object corresponding to an w32 window. |
7831 void * pReserved; | 7831 void * pReserved; |
7832 DWORD dwReserved; | 7832 DWORD dwReserved; |
7833 DWORD FlagsEx; | 7833 DWORD FlagsEx; |
7834 } NEWOPENFILENAME; | 7834 } NEWOPENFILENAME; |
7835 | 7835 |
7836 | 7836 |
7837 DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0, | 7837 DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0, |
7838 doc: /* Read file name, prompting with PROMPT in directory DIR. | 7838 doc: /* Read file name, prompting with PROMPT in directory DIR. |
7839 Use a file selection dialog. | 7839 Use a file selection dialog. |
7840 Select DEFAULT-FILENAME in the dialog's file selection box, if | 7840 Select DEFAULT-FILENAME in the dialog's file selection box, if |
7841 specified. Ensure that file exists if MUSTMATCH is non-nil. | 7841 specified. Ensure that file exists if MUSTMATCH is non-nil. |
7883 | 7883 |
7884 { | 7884 { |
7885 NEWOPENFILENAME new_file_details; | 7885 NEWOPENFILENAME new_file_details; |
7886 BOOL file_opened = FALSE; | 7886 BOOL file_opened = FALSE; |
7887 OPENFILENAME * file_details = &new_file_details.real_details; | 7887 OPENFILENAME * file_details = &new_file_details.real_details; |
7888 | 7888 |
7889 /* Prevent redisplay. */ | 7889 /* Prevent redisplay. */ |
7890 specbind (Qinhibit_redisplay, Qt); | 7890 specbind (Qinhibit_redisplay, Qt); |
7891 BLOCK_INPUT; | 7891 BLOCK_INPUT; |
7892 | 7892 |
7893 bzero (&new_file_details, sizeof (new_file_details)); | 7893 bzero (&new_file_details, sizeof (new_file_details)); |