Seiji Zenitani
zenit****@users*****
2005年 10月 23日 (日) 13:18:04 JST
Index: CarbonEmacsPackage/GPL/patch/carbon-emacs-package.patch
diff -u /dev/null CarbonEmacsPackage/GPL/patch/carbon-emacs-package.patch:1.1
--- /dev/null Sun Oct 23 13:18:04 2005
+++ CarbonEmacsPackage/GPL/patch/carbon-emacs-package.patch Sun Oct 23 13:18:04 2005
@@ -0,0 +1,187 @@
+*** src/macfns.c.orig Wed Jun 8 14:57:39 2005
+--- src/macfns.c Sun Jun 26 01:46:53 2005
+*************** mac_nav_event_callback (selector, parms,
+*** 4461,4466 ****
+--- 4461,4578 ----
+ void *data ;
+ {
+ }
++
++ #if MAC_OSX
++ DEFUN ("mac-show-menu-bar", Fmac_show_menu_bar, Smac_show_menu_bar, 0, 1, "",
++ doc: /* Show the menu bar. */)
++ (display)
++ Lisp_Object display;
++ {
++ if ( EQ (Vwindow_system, intern ("mac")))
++ ShowMenuBar();
++ return Qnil;
++ }
++ DEFUN ("mac-hide-menu-bar", Fmac_hide_menu_bar, Smac_hide_menu_bar, 0, 1, "",
++ doc: /* Hide the menu bar. */)
++ (display)
++ Lisp_Object display;
++ {
++ if ( EQ (Vwindow_system, intern ("mac")))
++ HideMenuBar();
++ return Qnil;
++ }
++ DEFUN ("mac-dialog", Fmac_dialog, Smac_dialog, 2, 2, "",
++ doc: /* Show a dialog. */)
++ (message, explanation)
++ Lisp_Object message, explanation;
++ {
++ DialogRef sheet=NULL;
++ AlertStdCFStringAlertParamRec alertParams;
++ struct frame *f = XFRAME (selected_frame);
++ CHECK_STRING (message);
++ CHECK_STRING (explanation);
++
++ if (FRAME_MAC_WINDOW (f))
++ {
++ GetStandardAlertDefaultParams(&alertParams,kStdCFStringAlertVersionOne);
++ alertParams.defaultText=(CFStringRef)kAlertDefaultOKText;
++ alertParams.defaultButton=kAlertStdAlertOKButton;
++
++ BLOCK_INPUT;
++ {
++ CFStringRef msgTitle = NULL, msgExplanation = NULL;
++ msgTitle = cfstring_create_with_string (message);
++ msgExplanation = cfstring_create_with_string (explanation);
++
++ OSStatus err;
++ err = CreateStandardAlert(kAlertNoteAlert,
++ msgTitle,
++ msgExplanation,
++ &alertParams,
++ &sheet);
++ if(err == noErr)
++ err = RunStandardAlert(sheet,
++ NULL,
++ NULL);
++ CFRelease (msgTitle);
++ CFRelease (msgExplanation);
++ }
++ UNBLOCK_INPUT;
++ }
++ return Qnil;
++ }
++
++ DEFUN ("mac-dialog-y-or-n-p", Fmac_dialog_y_or_n_p, Smac_dialog_y_or_n_p, 2, 2, "",
++ doc: /* Show a dialog, which asks user a "Yes or No" question.
++ Return t if answer is "Yes". Takes two arguments,
++ which is the strings to display to ask the question. */)
++ (message, explanation)
++ Lisp_Object message, explanation;
++ {
++ DialogRef sheet=NULL;
++ AlertStdCFStringAlertParamRec alertParams;
++ struct frame *f = XFRAME (selected_frame);
++ CHECK_STRING (message);
++ CHECK_STRING (explanation);
++ SInt16 index = 0;
++
++ if (FRAME_MAC_WINDOW (f))
++ {
++ GetStandardAlertDefaultParams(&alertParams,kStdCFStringAlertVersionOne);
++ alertParams.defaultText=CFSTR ("Yes");
++ alertParams.defaultButton=kAlertStdAlertOKButton;
++ alertParams.cancelText=CFSTR ("No");
++ alertParams.cancelButton=kAlertStdAlertCancelButton;
++
++ BLOCK_INPUT;
++ {
++ CFStringRef msgTitle = NULL, msgExplanation = NULL;
++ msgTitle = cfstring_create_with_string (message);
++ msgExplanation = cfstring_create_with_string (explanation);
++
++ OSStatus err;
++ err = CreateStandardAlert(kAlertNoteAlert,
++ msgTitle,
++ msgExplanation,
++ &alertParams,
++ &sheet);
++ if(err == noErr)
++ err = RunStandardAlert(sheet,
++ NULL,
++ &index);
++ CFRelease (msgTitle);
++ CFRelease (msgExplanation);
++ }
++ UNBLOCK_INPUT;
++ }
++ if( index==1 ){
++ return Qt;
++ }else{
++ return Qnil;
++ }
++ }
++ #endif /*MAC_OSX*/
++
+ #endif
+
+ /***********************************************************************
+*************** Chinese, Japanese, and Korean. */);
+*** 4674,4679 ****
+--- 4696,4707 ----
+
+ #if TARGET_API_MAC_CARBON
+ defsubr (&Sx_file_dialog);
++ #if MAC_OSX
++ defsubr (&Smac_show_menu_bar);
++ defsubr (&Smac_hide_menu_bar);
++ defsubr (&Smac_dialog);
++ defsubr (&Smac_dialog_y_or_n_p);
++ #endif
+ #endif
+ }
+
+--- src/puresize.h.~1.73.~ 2005-07-05 01:06:34.000000000 +0900
++++ src/puresize.h 2005-08-06 00:15:00.000000000 +0900
+@@ -38,7 +38,7 @@
+ #endif
+
+ #ifndef SITELOAD_PURESIZE_EXTRA
+-#define SITELOAD_PURESIZE_EXTRA 0
++#define SITELOAD_PURESIZE_EXTRA 100000
+ #endif
+
+ #ifndef BASE_PURESIZE
+--- src/mac.c.orig 2005-09-26 00:35:12.000000000 +0900
++++ src/mac.c 2005-09-26 00:35:26.000000000 +0900
+@@ -4513,7 +4513,7 @@
+ have the value "<path to lisp dir>:<path to leim dir>:<path to
+ site-lisp dir>". */
+ p = (char *) alloca (app_bundle_pathname_len + 50);
+- q = (char *) alloca (3 * app_bundle_pathname_len + 150);
++ q = (char *) alloca (4 * app_bundle_pathname_len + 200);
+ if (!getenv ("EMACSLOADPATH"))
+ {
+ q[0] = '\0';
+--- src/mac.c.orig 2005-08-07 21:33:17.000000000 +0900
++++ src/mac.c 2005-09-23 20:52:03.000000000 +0900
+@@ -4532,6 +4532,14 @@
+ strcat (q, p);
+ }
+
++ strcpy (p, "/Library/Application Support/Emacs");
++ if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR)
++ {
++ if (q[0] != '\0')
++ strcat (q, ":");
++ strcat (q, p);
++ }
++
+ strcpy (p, app_bundle_pathname);
+ strcat (p, "/Contents/Resources/site-lisp");
+ if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR)
+--- lisp/term/mac-win.el.orig 2005-07-05 01:06:34.000000000 +0900
++++ lisp/term/mac-win.el 2005-08-06 00:15:00.000000000 +0900
+@@ -1815,6 +1815,7 @@
+ ;; Make sure the drop target has positive co-ords
+ ;; before setting the selected frame - otherwise it
+ ;; won't work. <skx****@tardi*****>
++ (set-frame-parameter nil 'visibility t)
+ (let* ((window (posn-window (event-start event)))
+ (coords (posn-x-y (event-start event)))
+ (x (car coords))
Index: CarbonEmacsPackage/GPL/patch/inline_patch-20041229.tar.gz
Index: CarbonEmacsPackage/GPL/patch/toolbar-button.patch
diff -u /dev/null CarbonEmacsPackage/GPL/patch/toolbar-button.patch:1.1
--- /dev/null Sun Oct 23 13:18:04 2005
+++ CarbonEmacsPackage/GPL/patch/toolbar-button.patch Sun Oct 23 13:18:04 2005
@@ -0,0 +1,172 @@
+Index: src/keyboard.c
+===================================================================
+RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
+retrieving revision 1.833
+diff -c -r1.833 keyboard.c
+*** src/keyboard.c 13 Jul 2005 05:30:56 -0000 1.833
+--- src/keyboard.c 17 Jul 2005 20:23:36 -0000
+***************
+*** 517,522 ****
+--- 517,525 ----
+ Lisp_Object Qmake_frame_visible;
+ Lisp_Object Qselect_window;
+ Lisp_Object Qhelp_echo;
++ #ifdef MAC_OSX
++ Lisp_Object Qtoggle_frame_toolbar;
++ #endif
+
+ #ifdef HAVE_MOUSE
+ Lisp_Object Qmouse_fixup_help_message;
+***************
+*** 4017,4022 ****
+--- 4020,4034 ----
+ kbd_fetch_ptr = event + 1;
+ }
+ #endif
++ #ifdef MAC_OSX
++ else if (event->kind == TOGGLE_TOOLBAR_EVENT)
++ {
++ /* Make an event (toggle-frame-toolbar (FRAME)). */
++ obj = Fcons (event->frame_or_window, Qnil);
++ obj = Fcons (Qtoggle_frame_toolbar, Fcons (obj, Qnil));
++ kbd_fetch_ptr = event + 1;
++ }
++ #endif
+ else if (event->kind == BUFFER_SWITCH_EVENT)
+ {
+ /* The value doesn't matter here; only the type is tested. */
+***************
+*** 10773,10778 ****
+--- 10785,10793 ----
+ /* `select-window' should be handled just like `switch-frame'
+ in read_key_sequence. */
+ {&Qselect_window, "select-window", &Qswitch_frame}
++ #ifdef MAC_OSX
++ ,{&Qtoggle_frame_toolbar, "toggle-frame-toolbar", &Qtoggle_frame_toolbar}
++ #endif
+ };
+
+ void
+***************
+*** 11436,11441 ****
+--- 11451,11458 ----
+
+ initial_define_lispy_key (Vspecial_event_map, "delete-frame",
+ "handle-delete-frame");
++ /* initial_define_lispy_key (Vspecial_event_map, "toggle-frame-toolbar",
++ "handle-toggle-frame-toolbar"); */
+ /* Here we used to use `ignore-event' which would simple set prefix-arg to
+ current-prefix-arg, as is done in `handle-switch-frame'.
+ But `handle-switch-frame is not run from the special-map.
+Index: src/termhooks.h
+===================================================================
+RCS file: /cvsroot/emacs/emacs/src/termhooks.h,v
+retrieving revision 1.69
+diff -c -r1.69 termhooks.h
+*** src/termhooks.h 4 Jul 2005 16:06:35 -0000 1.69
+--- src/termhooks.h 17 Jul 2005 20:23:36 -0000
+***************
+*** 289,294 ****
+--- 289,298 ----
+ DEICONIFY_EVENT, /* An X client deiconified this window. */
+ MENU_BAR_ACTIVATE_EVENT, /* A button press in the menu bar
+ (toolkit version only). */
++ #ifdef MAC_OSX
++ TOGGLE_TOOLBAR_EVENT, /* A client requestes toggling the tool-bar */
++ #endif
++
+ DRAG_N_DROP_EVENT, /* A drag-n-drop event is generated when
+ files selected outside of Emacs are dropped
+ onto an Emacs window.
+Index: src/macfns.c
+===================================================================
+RCS file: /cvsroot/emacs/emacs/src/macfns.c,v
+retrieving revision 1.63
+diff -c -r1.63 macfns.c
+*** src/macfns.c 4 Jul 2005 16:06:33 -0000 1.63
+--- src/macfns.c 17 Jul 2005 20:23:37 -0000
+***************
+*** 2226,2232 ****
+ #if TARGET_API_MAC_CARBON
+ CreateNewWindow (kDocumentWindowClass,
+ kWindowStandardDocumentAttributes
+! /* | kWindowToolbarButtonAttribute */,
+ &r, &FRAME_MAC_WINDOW (f));
+ if (FRAME_MAC_WINDOW (f))
+ {
+--- 2226,2232 ----
+ #if TARGET_API_MAC_CARBON
+ CreateNewWindow (kDocumentWindowClass,
+ kWindowStandardDocumentAttributes
+! | kWindowToolbarButtonAttribute,
+ &r, &FRAME_MAC_WINDOW (f));
+ if (FRAME_MAC_WINDOW (f))
+ {
+Index: src/macterm.c
+===================================================================
+RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
+retrieving revision 1.123
+diff -c -r1.123 macterm.c
+*** src/macterm.c 14 Jul 2005 09:23:24 -0000 1.123
+--- src/macterm.c 17 Jul 2005 20:23:40 -0000
+***************
+*** 9124,9129 ****
+--- 9124,9134 ----
+ if (TrackBox (window_ptr, er.where, part_code))
+ do_zoom_window (window_ptr, part_code);
+ break;
++ case inToolbarButton:
++ inev.kind = TOGGLE_TOOLBAR_EVENT;
++ XSETFRAME (inev.frame_or_window,
++ mac_window_to_frame (window_ptr));
++ break;
+
+ default:
+ break;
+Index: lisp/toolbar/tool-bar.el
+===================================================================
+RCS file: /cvsroot/emacs/emacs/lisp/toolbar/tool-bar.el,v
+retrieving revision 1.40
+diff -c -r1.40 tool-bar.el
+*** lisp/toolbar/tool-bar.el 4 Jul 2005 23:09:00 -0000 1.40
+--- lisp/toolbar/tool-bar.el 17 Jul 2005 20:23:40 -0000
+***************
+*** 265,271 ****
+--- 265,301 ----
+ (popup-menu menu-bar-help-menu))
+ 'help
+ :help "Pop up the Help menu")
++
++ ;; Toolbar button, mapped to handle-toggle-tool-bar in tool-bar.el
++ ;; (Toolbar button - on systems that support it!)
++ (global-set-key [toggle-frame-toolbar] 'handle-toggle-tool-bar)
++
+ )
++
++
++ ;; local toolbars
++
++ (defun tool-bar-enabled-p (&optional frame)
++ "Evaluates to non-nil if the tool-bar is present
++ in frame FRAME. If FRAME is nil, the function applies
++ to the selected frame."
++ (> (or (frame-parameter frame 'tool-bar-lines) 0) 0))
++
++ (defun toggle-tool-bar (&optional frame)
++ "Switches the tool bar on and off in frame FRAME.
++ If FRAME is nil, the change applies to the selected frame."
++ (interactive)
++ (modify-frame-parameters frame
++ (list (cons 'tool-bar-lines
++ (if (tool-bar-enabled-p frame)
++ 0
++ 1
++ )))))
++
++ (defun handle-toggle-tool-bar (event)
++ "Handles a tool-bar toggle event."
++ (interactive "e")
++ (toggle-tool-bar (posn-window (event-start event))))
+
+ (provide 'tool-bar)
+
Index: CarbonEmacsPackage/GPL/patch/transparency-2.1.1.tar.gz
Index: CarbonEmacsPackage/GPL/patch/transparency2-ui.patch
diff -u /dev/null CarbonEmacsPackage/GPL/patch/transparency2-ui.patch:1.1
--- /dev/null Sun Oct 23 13:18:04 2005
+++ CarbonEmacsPackage/GPL/patch/transparency2-ui.patch Sun Oct 23 13:18:04 2005
@@ -0,0 +1,222 @@
+diff -N -u -r emacs.orig/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/classes.nib emacs/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/classes.nib
+--- emacs.orig/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/classes.nib 1970-01-01 09:00:00.000000000 +0900
++++ emacs/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/classes.nib 2005-10-08 23:05:10.000000000 +0900
+@@ -0,0 +1,4 @@
++{
++IBClasses = ();
++IBVersion = 1;
++}
+diff -N -u -r emacs.orig/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/info.nib emacs/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/info.nib
+--- emacs.orig/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/info.nib 1970-01-01 09:00:00.000000000 +0900
++++ emacs/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/info.nib 2005-10-08 23:05:10.000000000 +0900
+@@ -0,0 +1,18 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++ <key>IBDocumentLocation</key>
++ <string>50 9 356 240 0 0 1024 746 </string>
++ <key>IBFramework Version</key>
++ <string>439.0</string>
++ <key>IBOpenObjects</key>
++ <array>
++ <integer>166</integer>
++ </array>
++ <key>IBSystem Version</key>
++ <string>8C46</string>
++ <key>targetFramework</key>
++ <string>IBCarbonFramework</string>
++</dict>
++</plist>
+diff -N -u -r emacs.orig/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/objects.xib emacs/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/objects.xib
+--- emacs.orig/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/objects.xib 1970-01-01 09:00:00.000000000 +0900
++++ emacs/mac/Emacs.app/Contents/Resources/English.lproj/Sheet.nib/objects.xib 2005-10-08 23:05:10.000000000 +0900
+@@ -0,0 +1,77 @@
++<?xml version="1.0" standalone="yes"?>
++<object class="NSIBObjectData">
++ <string name="targetFramework">IBCarbonFramework</string>
++ <object name="rootObject" class="NSCustomObject" id="1">
++ <string name="customClass">NSApplication</string>
++ </object>
++ <array count="7" name="allObjects">
++ <object class="IBCarbonWindow" id="166">
++ <string name="windowRect">245 253 449 681 </string>
++ <string name="title">Sheet</string>
++ <object name="rootControl" class="IBCarbonRootControl" id="167">
++ <string name="bounds">0 0 204 428 </string>
++ <array count="5" name="subviews">
++ <object class="IBCarbonButton" id="180">
++ <string name="bounds">164 336 184 408 </string>
++ <ostype name="controlSignature">okok</ostype>
++ <string name="title">OK</string>
++ <ostype name="command">ok </ostype>
++ <int name="buttonType">1</int>
++ </object>
++ <object class="IBCarbonStaticText" id="182">
++ <string name="bounds">20 34 64 277 </string>
++ <string name="title">Active window</string>
++ </object>
++ <object class="IBCarbonSlider" id="203">
++ <string name="bounds">47 57 73 341 </string>
++ <ostype name="controlSignature">sldr</ostype>
++ <boolean name="isLive">TRUE</boolean>
++ <int name="numTickMarks">11</int>
++ <int name="initialValue">100</int>
++ </object>
++ <object class="IBCarbonStaticText" id="205">
++ <string name="bounds">86 34 130 277 </string>
++ <string name="title">Inactive window</string>
++ </object>
++ <object class="IBCarbonSlider" id="204">
++ <string name="bounds">110 57 136 341 </string>
++ <ostype name="controlSignature">sldr</ostype>
++ <int name="controlID">1</int>
++ <boolean name="isLive">TRUE</boolean>
++ <int name="numTickMarks">11</int>
++ <int name="initialValue">100</int>
++ </object>
++ </array>
++ </object>
++ <boolean name="hasCloseBox">FALSE</boolean>
++ <boolean name="hasCollapseBox">FALSE</boolean>
++ <boolean name="isResizable">FALSE</boolean>
++ <int name="carbonWindowClass">11</int>
++ <boolean name="hideOnFullScreen">TRUE</boolean>
++ <boolean name="hideOnSuspend">TRUE</boolean>
++ <boolean name="doesNotCycle">TRUE</boolean>
++ </object>
++ <reference idRef="167"/>
++ <reference idRef="180"/>
++ <reference idRef="182"/>
++ <reference idRef="203"/>
++ <reference idRef="204"/>
++ <reference idRef="205"/>
++ </array>
++ <array count="7" name="allParents">
++ <reference idRef="1"/>
++ <reference idRef="166"/>
++ <reference idRef="167"/>
++ <reference idRef="167"/>
++ <reference idRef="167"/>
++ <reference idRef="167"/>
++ <reference idRef="167"/>
++ </array>
++ <dictionary count="2" name="nameTable">
++ <string>Files Owner</string>
++ <reference idRef="1"/>
++ <string>Sheet</string>
++ <reference idRef="166"/>
++ </dictionary>
++ <unsigned_int name="nextObjectID">211</unsigned_int>
++</object>
+diff -N -u -r emacs.orig/src/macfns.c emacs/src/macfns.c
+--- emacs.orig/src/macfns.c 2005-10-09 23:55:50.000000000 +0900
++++ emacs/src/macfns.c 2005-10-10 00:11:26.000000000 +0900
+@@ -2009,6 +2009,94 @@
+
+ return;
+ }
++
++#ifdef MAC_OSX
++#if TARGET_API_MAC_CARBON
++/***********************************************************************
++ Transparency dialog
++ ***********************************************************************/
++pascal void
++ActiveAlphaProc( ControlHandle control, SInt16 part )
++{
++ struct frame *f = XFRAME (selected_frame);
++ float active_alpha = GetControlValue( control ) / 100.0;
++
++ if( active_alpha > 1.0 ){
++ active_alpha = 1.0;
++ }
++ if( active_alpha < 0.0 ){
++ active_alpha = 0.0;
++ }
++
++ BLOCK_INPUT;
++ f->active_alpha = active_alpha;
++ x_set_frame_alpha (f, 1);
++ UNBLOCK_INPUT;
++}
++
++pascal void
++InactiveAlphaProc( ControlHandle control, SInt16 part )
++{
++ struct frame *f = XFRAME (selected_frame);
++ float inactive_alpha = GetControlValue( control ) / 100.0;
++
++ if( inactive_alpha > 1.0 ){
++ inactive_alpha = 1.0;
++ }
++ if( inactive_alpha < 0.0 ){
++ inactive_alpha = 0.0;
++ }
++
++ BLOCK_INPUT;
++ f->inactive_alpha = inactive_alpha;
++ UNBLOCK_INPUT;
++}
++
++pascal void
++OKButtonProc( ControlHandle control, SInt16 part )
++{
++ WindowRef sheet=GetControlOwner(control);
++ QuitAppModalLoopForWindow(sheet);
++ HideSheetWindow(sheet);
++ DisposeWindow(sheet);
++ sleep(1);
++}
++
++DEFUN ("mac-transparency-dialog", Fmac_transparency_dialog,
++ Smac_transparency_dialog, 0, 0, "",
++ doc: /* (Experimental) Show a dialog to set the window transparency. */)
++ ()
++{
++ struct frame *f = XFRAME (selected_frame);
++ const ControlID kActiveSlider = { 'sldr', 0 };
++ const ControlID kInactiveSlider = { 'sldr', 1 };
++ const ControlID kOKButton = { 'okok', 0 };
++
++ ControlRef ActiveControl, InactiveControl, OKControl;
++ IBNibRef nibRef;
++ WindowRef sheet=NULL;
++
++ CreateNibReference(CFSTR("Sheet"), &nibRef);
++ CreateWindowFromNib(nibRef, CFSTR("Sheet"), &sheet);
++ DisposeNibReference(nibRef);
++
++ GetControlByID( sheet, &kActiveSlider, &ActiveControl );
++ SetControlValue( ActiveControl, 100 * f->active_alpha );
++ SetControlAction( ActiveControl, NewEventHandlerUPP(ActiveAlphaProc) );
++
++ GetControlByID( sheet, &kInactiveSlider, &InactiveControl );
++ SetControlValue( InactiveControl, 100 * f->inactive_alpha );
++ SetControlAction( InactiveControl, NewEventHandlerUPP(InactiveAlphaProc) );
++
++ GetControlByID( sheet, &kOKButton, &OKControl );
++ SetControlAction( OKControl, NewEventHandlerUPP(OKButtonProc) );
++
++ ShowSheetWindow(sheet,FRAME_MAC_WINDOW (f));
++ RunAppModalLoopForWindow(sheet);
++}
++#endif
++#endif /* MAC_OSX */
++/* --- end (Transparency dialog) --- */
+
+ /* Subroutines of creating a frame. */
+
+@@ -4601,6 +4689,12 @@
+ hourglass_atimer = NULL;
+ hourglass_shown_p = 0;
+
++#if MAC_OSX
++#if TARGET_API_MAC_CARBON
++ defsubr (&Smac_transparency_dialog); // Transparency dialog
++#endif
++#endif
++
+ defsubr (&Sx_show_tip);
+ defsubr (&Sx_hide_tip);
+ tip_timer = Qnil;