[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/gnus-cloud 4bc13b7 25/28: Merge branch 'master' of
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] scratch/gnus-cloud 4bc13b7 25/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: |
Mon, 18 Jul 2016 14:04:15 +0000 (UTC) |
branch: scratch/gnus-cloud
commit 4bc13b744c0c5a754e2a5dddad170a42b1f5334b
Merge: e582450 02ca5db
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
src/nsmenu.m | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 10dfe8a..83ded6d 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1420,29 +1420,19 @@ update_frame_tool_bar (struct frame *f)
==========================================================================
*/
-struct Popdown_data
-{
- NSAutoreleasePool *pool;
- EmacsDialogPanel *dialog;
-};
-
static void
pop_down_menu (void *arg)
{
- struct Popdown_data *unwind_data = arg;
+ EmacsDialogPanel *panel = arg;
- block_input ();
if (popup_activated_flag)
{
- EmacsDialogPanel *panel = unwind_data->dialog;
+ block_input ();
popup_activated_flag = 0;
[panel close];
- [unwind_data->pool release];
[[FRAME_NS_VIEW (SELECTED_FRAME ()) window] makeKeyWindow];
+ unblock_input ();
}
-
- xfree (unwind_data);
- unblock_input ();
}
@@ -1453,7 +1443,6 @@ ns_popup_dialog (struct frame *f, Lisp_Object header,
Lisp_Object contents)
Lisp_Object tem, title;
NSPoint p;
BOOL isQ;
- NSAutoreleasePool *pool;
NSTRACE ("ns_popup_dialog");
@@ -1473,18 +1462,13 @@ ns_popup_dialog (struct frame *f, Lisp_Object header,
Lisp_Object contents)
contents = list2 (title, Fcons (build_string ("Ok"), Qt));
block_input ();
- pool = [[NSAutoreleasePool alloc] init];
dialog = [[EmacsDialogPanel alloc] initFromContents: contents
isQuestion: isQ];
{
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
- struct Popdown_data *unwind_data = xmalloc (sizeof (*unwind_data));
-
- unwind_data->pool = pool;
- unwind_data->dialog = dialog;
- record_unwind_protect_ptr (pop_down_menu, unwind_data);
+ record_unwind_protect_ptr (pop_down_menu, dialog);
popup_activated_flag = 1;
tem = [dialog runDialogAt: p];
unbind_to (specpdl_count, Qnil); /* calls pop_down_menu */
- [Emacs-diffs] scratch/gnus-cloud fbda536 18/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, (continued)
- [Emacs-diffs] scratch/gnus-cloud fbda536 18/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 15fda1f 22/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 864e344 14/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 548f157 10/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 1aa29cc 19/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud fae4411 16/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud b996f42 27/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 9af4ba0 08/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud e582450 24/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 82fe6fa 17/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 4bc13b7 25/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs,
Teodor Zlatanov <=
- [Emacs-diffs] scratch/gnus-cloud 0c9487a 12/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud e6381fa 13/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 8d67982 01/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud ae18a15 21/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 73e10a8 15/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud cbd54d0 28/28: Minor gnus-cloud UI improvements., Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 4eae8f1 20/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud aba6d42 09/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud bef171c 26/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud f5a4b91 05/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18