components/vim/vim72-patches/7.2.256
changeset 379 c6a17bba1da3
parent 378 f0b61ed1d10d
child 380 e92b3b4a1c66
equal deleted inserted replaced
378:f0b61ed1d10d 379:c6a17bba1da3
     1 To: [email protected]
       
     2 Subject: Patch 7.2.256
       
     3 Fcc: outbox
       
     4 From: Bram Moolenaar <[email protected]>
       
     5 Mime-Version: 1.0
       
     6 Content-Type: text/plain; charset=UTF-8
       
     7 Content-Transfer-Encoding: 8bit
       
     8 ------------
       
     9 
       
    10 Patch 7.2.256
       
    11 Problem:    When 'guifont' was not set GTK font dialog doesn't have a default.
       
    12 	    (Andreas Metzler)
       
    13 Solution:   Set default to DEFAULT_FONT. (James Vega)
       
    14 Files:	    src/gui_gtk_x11.c
       
    15 
       
    16 
       
    17 *** ../vim-7.2.255/src/gui_gtk_x11.c	2009-07-01 18:04:30.000000000 +0200
       
    18 --- src/gui_gtk_x11.c	2009-09-11 14:21:32.000000000 +0200
       
    19 ***************
       
    20 *** 4729,4734 ****
       
    21 --- 4729,4737 ----
       
    22       if (oldval != NULL && *oldval != NUL)
       
    23   	gtk_font_selection_dialog_set_font_name(
       
    24   		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), (char *)oldval);
       
    25 +     else
       
    26 + 	gtk_font_selection_dialog_set_font_name(
       
    27 + 		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), DEFAULT_FONT);
       
    28   
       
    29       if (gui.fontname)
       
    30       {
       
    31 ***************
       
    32 *** 4816,4821 ****
       
    33 --- 4819,4827 ----
       
    34   	if (oldname != oldval)
       
    35   	    vim_free(oldname);
       
    36       }
       
    37 +     else
       
    38 + 	gtk_font_selection_dialog_set_font_name(
       
    39 + 		GTK_FONT_SELECTION_DIALOG(dialog), DEFAULT_FONT);
       
    40   
       
    41       response = gtk_dialog_run(GTK_DIALOG(dialog));
       
    42   
       
    43 *** ../vim-7.2.255/src/version.c	2009-09-11 15:20:22.000000000 +0200
       
    44 --- src/version.c	2009-09-11 15:45:36.000000000 +0200
       
    45 ***************
       
    46 *** 678,679 ****
       
    47 --- 678,681 ----
       
    48   {   /* Add new patch number below this line */
       
    49 + /**/
       
    50 +     256,
       
    51   /**/
       
    52 
       
    53 -- 
       
    54 Get a life?  What is the URL where it can be downloaded?
       
    55 
       
    56  /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
       
    57 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
       
    58 \\\        download, build and distribute -- http://www.A-A-P.org        ///
       
    59  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///