Loading ...
Sorry, an error occurred while loading the content.

[PATCH] merged conflicts that were hard to merge during the rebase

Expand Messages
  • Nicolas Weber
    ... src/MacVim/MMWindowController.m | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/MacVim/MMWindowController.m
    Message 1 of 5 , Oct 30, 2007
    • 0 Attachment
      ---
      src/MacVim/MMWindowController.m | 13 +++++++++++--
      1 files changed, 11 insertions(+), 2 deletions(-)

      diff --git a/src/MacVim/MMWindowController.m b/src/MacVim/MMWindowController.m
      index 493e3da..32349d8 100644
      --- a/src/MacVim/MMWindowController.m
      +++ b/src/MacVim/MMWindowController.m
      @@ -733,6 +733,8 @@ NSMutableArray *buildMenuAddress(NSMenu *menu)

      - (NSSize)resizeVimViewToFitSize:(NSSize)size
      {
      + // If our optimal (rows,cols) do not match our current (rows,cols), resize
      + // ourselves and tell the Vim process to sync up.
      int desired[2];
      NSSize newSize = [vimView getDesiredRows:&desired[0] columns:&desired[1]
      forSize:size];
      @@ -741,11 +743,18 @@ NSMutableArray *buildMenuAddress(NSMenu *menu)
      [vimView getActualRows:&rows columns:&columns];

      if (desired[0] != rows || desired[1] != columns) {
      - // NSLog(@"Notify Vim that text storage dimensions changed to %dx%d",
      - // desired[0], desired[1]);
      + // NSLog(@"Notify Vim that text storage dimensions changed from %dx%d "
      + // @"to %dx%d", columns, rows, desired[0], desired[1]);
      NSData *data = [NSData dataWithBytes:desired length:2*sizeof(int)];

      [vimController sendMessage:SetTextDimensionsMsgID data:data];
      +
      + // We only want to set the window title if this resize came from
      + // a live-resize, not (for example) setting 'columns' or 'lines'.
      + if ([[self textView] inLiveResize]) {
      + [[self window] setTitle:[NSString stringWithFormat:@"%dx%d",
      + desired[1], desired[0]]];
      + }
      }

      return newSize;
      --
      1.5.3.4


      --~--~---------~--~----~------------~-------~--~----~
      You received this message from the "vim_mac" maillist.
      For more information, visit http://www.vim.org/maillist.php
      -~----------~----~----~----~------~----~------~--~---
    Your message has been successfully submitted and would be delivered to recipients shortly.