Revision: 76517 http://trac.macports.org/changeset/76517 Author: css@macports.org Date: 2011-02-26 18:01:21 -0800 (Sat, 26 Feb 2011) Log Message: ----------- Cleanup the fullscreen patch and make a small fix. refs #28199 Modified Paths: -------------- trunk/dports/aqua/emacs-app/Portfile trunk/dports/aqua/emacs-app/files/patch-fullscreen.diff Added Paths: ----------- trunk/dports/aqua/emacs-app/files/patch-ns-win.el.diff Modified: trunk/dports/aqua/emacs-app/Portfile =================================================================== --- trunk/dports/aqua/emacs-app/Portfile 2011-02-26 23:32:13 UTC (rev 76516) +++ trunk/dports/aqua/emacs-app/Portfile 2011-02-27 02:01:21 UTC (rev 76517) @@ -5,7 +5,7 @@ name emacs-app version 23.2 -revision 1 +revision 2 categories aqua editors maintainers css description The GNU Emacs text editor (Cocoa version) @@ -34,9 +34,10 @@ configure.args --with-ns --without-x --without-dbus +patchfiles patch-ns-win.el.diff + variant fullscreen description {Add fullscreen patch from http://gist.github.com/291150 as mentioned in http://www.sanityinc.com/full-screen-support-for-cocoa-emacs-on-osx} { - patchfiles patch-fullscreen.diff - patch.args -p1 + patchfiles-append patch-fullscreen.diff } destroot { Modified: trunk/dports/aqua/emacs-app/files/patch-fullscreen.diff =================================================================== --- trunk/dports/aqua/emacs-app/files/patch-fullscreen.diff 2011-02-26 23:32:13 UTC (rev 76516) +++ trunk/dports/aqua/emacs-app/files/patch-fullscreen.diff 2011-02-27 02:01:21 UTC (rev 76517) @@ -1,8 +1,6 @@ -diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el -index 157b2dd..f3807b7 100644 ---- a/lisp/term/ns-win.el -+++ b/lisp/term/ns-win.el -@@ -1263,6 +1263,11 @@ the operating system.") +--- lisp/term/ns-win.el.orig 2011-01-29 15:01:48.000000000 -0500 ++++ lisp/term/ns-win.el 2011-01-29 15:01:52.000000000 -0500 +@@ -1263,6 +1263,11 @@ (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system)) @@ -14,11 +12,9 @@ (provide 'ns-win) ;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644 -diff --git a/src/nsfns.m b/src/nsfns.m -index 642ff79..03ffcf7 100644 ---- a/src/nsfns.m -+++ b/src/nsfns.m -@@ -2589,6 +2589,34 @@ Value is t if tooltip was open, nil otherwise. */) +--- src/nsfns.m.orig 2011-01-29 15:01:48.000000000 -0500 ++++ src/nsfns.m 2011-01-29 15:01:52.000000000 -0500 +@@ -2599,6 +2599,34 @@ #endif @@ -53,7 +49,7 @@ /* ========================================================================== -@@ -2676,6 +2704,8 @@ be used as the image of the icon representing the frame. */); +@@ -2684,6 +2712,8 @@ defsubr (&Sx_show_tip); defsubr (&Sx_hide_tip); @@ -62,11 +58,9 @@ /* used only in fontset.c */ check_window_system_func = check_ns; -diff --git a/src/nsterm.h b/src/nsterm.h -index 29d312a..17b19e4 100644 ---- a/src/nsterm.h -+++ b/src/nsterm.h -@@ -95,8 +95,25 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ +--- src/nsterm.h.orig 2011-01-29 15:01:48.000000000 -0500 ++++ src/nsterm.h 2011-01-29 15:01:52.000000000 -0500 +@@ -95,8 +95,25 @@ { NSPoint grabOffset; } @@ -92,11 +86,9 @@ /* ========================================================================== -diff --git a/src/nsterm.m b/src/nsterm.m -index 9256c08..8bbb575 100644 ---- a/src/nsterm.m -+++ b/src/nsterm.m -@@ -686,6 +686,13 @@ ns_focus (struct frame *f, NSRect *r, int n) +--- src/nsterm.m.orig 2011-01-29 15:01:48.000000000 -0500 ++++ src/nsterm.m 2011-01-29 15:01:52.000000000 -0500 +@@ -685,6 +685,13 @@ /*debug_lock--; */ } @@ -110,7 +102,7 @@ if (view) #ifdef NS_IMPL_GNUSTEP r ? [view lockFocusInRect: u] : [view lockFocus]; -@@ -1131,8 +1138,14 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows) +@@ -1130,8 +1137,14 @@ f->scroll_bar_actual_width = NS_SCROLL_BAR_WIDTH (f); compute_fringe_widths (f, 0); @@ -127,7 +119,7 @@ /* If we have a toolbar, take its height into account. */ if (tb) -@@ -1150,7 +1163,7 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows) +@@ -1149,7 +1162,7 @@ + FRAME_NS_TOOLBAR_HEIGHT (f); /* constrain to screen if we can */ @@ -136,7 +128,7 @@ { NSSize sz = [screen visibleFrame].size; NSSize ez = { wr.size.width - sz.width, wr.size.height - sz.height }; -@@ -1197,7 +1210,7 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows) +@@ -1196,7 +1209,7 @@ change_frame_size (f, rows, cols, 0, 1, 0); /* pretend, delay, safe */ FRAME_PIXEL_WIDTH (f) = pixelwidth; FRAME_PIXEL_HEIGHT (f) = pixelheight; @@ -145,7 +137,7 @@ mark_window_cursors_off (XWINDOW (f->root_window)); cancel_mouse_face (f); -@@ -5609,6 +5622,59 @@ extern void update_window_cursor (struct window *w, int on); +@@ -5589,6 +5602,59 @@ @implementation EmacsWindow @@ -205,7 +197,7 @@ /* called only on resize clicks by special case in EmacsApp-sendEvent */ - (void)mouseDown: (NSEvent *)theEvent { -@@ -5667,6 +5733,32 @@ extern void update_window_cursor (struct window *w, int on); +@@ -5647,6 +5713,32 @@ @end /* EmacsWindow */ Added: trunk/dports/aqua/emacs-app/files/patch-ns-win.el.diff =================================================================== --- trunk/dports/aqua/emacs-app/files/patch-ns-win.el.diff (rev 0) +++ trunk/dports/aqua/emacs-app/files/patch-ns-win.el.diff 2011-02-27 02:01:21 UTC (rev 76517) @@ -0,0 +1,11 @@ +--- lisp/term/ns-win.el.orig 2010-12-12 23:31:04.000000000 -0500 ++++ lisp/term/ns-win.el 2010-12-12 23:32:00.000000000 -0500 +@@ -785,7 +785,7 @@ + "Do a `find-file' with the `ns-input-file' as argument." + (interactive) + (let ((f) (file) (bufwin1) (bufwin2)) +- (setq f (file-truename (car ns-input-file))) ++ (setq f (file-truename (expand-file-name (car ns-input-file) command-line-default-directory))) + (setq ns-input-file (cdr ns-input-file)) + (setq file (find-file-noselect f)) + (setq bufwin1 (get-buffer-window file 'visible))