diff -Nurd bluefish-1.0.5-orig/man/Makefile.in bluefish-1.0.5/man/Makefile.in --- bluefish-1.0.5-orig/man/Makefile.in 2005-10-11 19:05:17.000000000 +0200 +++ bluefish-1.0.5/man/Makefile.in 2006-02-10 00:15:36.000000000 +0100 @@ -36,4 +36,5 @@ clean: distclean: clean + rm -f Makefile diff -Nurd bluefish-1.0.5-orig/src/bluefish.c bluefish-1.0.5/src/bluefish.c --- bluefish-1.0.5-orig/src/bluefish.c 2006-01-18 15:13:55.000000000 +0100 +++ bluefish-1.0.5/src/bluefish.c 2006-02-10 10:40:15.000000000 +0100 @@ -2,7 +2,7 @@ * bluefish.c - the main function * * Copyright (C) 1998 Olivier Sessink and Chris Mazuc - * Copyright (C) 1999-2004 Olivier Sessink + * Copyright (C) 1999-2006 Olivier Sessink * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,9 +22,9 @@ /* #define DEBUG */ #include -#include /* getopt() */ -#include /* getopt() exit() and abort() on Solaris */ -#include /* nanosleep */ +#include /* getopt() exit() and abort() on Solaris */ +#include /* nanosleep */ +#include /* getopt() */ #include "bluefish.h" @@ -39,19 +39,20 @@ #include #endif -#include "document.h" /* */ -#include "gui.h" /* gui_create_main() */ -#include "fref.h" /* fref_init() */ -#include "bookmark.h" /* bmark_init() */ -#include "rcfile.h" /* rcfile_parse_main() */ -#include "bf_lib.h" /* create_full_path() */ -#include "highlight.h" /* hl_init() */ -#include "msg_queue.h" /* msg_queue_start()*/ -#include "stringlist.h" /* put_stringlist(), get_stringlist() */ -#include "gtk_easy.h" /* flush_queue() */ -#include "filebrowser.h" /* filters_rebuild() */ +#include "authen.h" /* set_authen_callbacks() */ +#include "bf_lib.h" /* create_full_path() */ +#include "bookmark.h" /* bmark_init() */ +#include "document.h" +#include "filebrowser.h" /* filters_rebuild() */ +#include "fref.h" /* fref_init() */ +#include "gtk_easy.h" /* flush_queue() */ +#include "gui.h" /* gui_create_main() */ +#include "highlight.h" /* hl_init() */ +#include "msg_queue.h" /* msg_queue_start()*/ +#include "pixmap.h" /* default_icon_list() */ #include "project.h" -#include "authen.h" /* set_authen_callbacks() */ +#include "rcfile.h" /* rcfile_parse_main() */ +#include "stringlist.h" /* put_stringlist(), get_stringlist() */ /*********************************************/ /* this var is global for all bluefish files */ @@ -161,6 +162,7 @@ #endif /* HAVE_ATLEAST_GNOMEVFS_2_6 */ #endif /* HAVE_ATLEAST_GNOME_2_6 */ #endif /* HAVE_GNOME_VFS */ + gtk_window_set_default_icon_list (default_icon_list()); main_v = g_new0(Tmain, 1); main_v->session = g_new0(Tsessionvars,1); main_v->session->view_html_toolbar = main_v->session->view_main_toolbar = main_v->session->view_custom_menu = main_v->session->view_left_panel = 1; diff -Nurd bluefish-1.0.5-orig/src/document.c bluefish-1.0.5/src/document.c --- bluefish-1.0.5-orig/src/document.c 2006-01-29 21:33:52.000000000 +0100 +++ bluefish-1.0.5/src/document.c 2006-02-10 00:15:37.000000000 +0100 @@ -1795,14 +1795,17 @@ } else { /* (kevent->keyval == GDK_End) || (kevent->keyval == GDK_KP_End) */ if (!gtk_text_iter_ends_line (&iter)) - gtk_text_iter_forward_to_line_end (&iter); + gtk_text_iter_forward_to_line_end (&iter); linestart = iter; - - while ((g_unichar_isspace (gtk_text_iter_get_char (&iter)) && !gtk_text_iter_starts_line (&iter)) || gtk_text_iter_is_end (&iter)) + + if (gtk_text_iter_is_end (&iter) && !gtk_text_iter_starts_line (&iter)) + gtk_text_iter_backward_char (&iter); + + while (g_unichar_isspace (gtk_text_iter_get_char (&iter)) && !gtk_text_iter_starts_line (&iter)) gtk_text_iter_backward_char (&iter); - if (!gtk_text_iter_starts_line (&iter)) + if ((!gtk_text_iter_starts_line (&iter) || !gtk_text_iter_ends_line (&iter)) && !g_unichar_isspace (gtk_text_iter_get_char (&iter))) gtk_text_iter_forward_char (&iter); } diff -Nurd bluefish-1.0.5-orig/src/gui.c bluefish-1.0.5/src/gui.c --- bluefish-1.0.5-orig/src/gui.c 2006-01-29 08:36:31.000000000 +0100 +++ bluefish-1.0.5/src/gui.c 2006-02-10 00:15:37.000000000 +0100 @@ -21,35 +21,35 @@ /* #define DEBUG */ #include -#include /* nanosleep() */ -#include /* strchr() */ -#include /* exit() */ -#include /* exit() on Solaris */ +#include /* exit() on Solaris */ +#include /* strchr() */ +#include /* nanosleep() */ +#include /* exit() */ #include "config.h" #include "bluefish.h" #include "gui.h" -#include "document.h" /* file_new_cb() */ +#include "bf_lib.h" /* get_int_from_string() */ +#include "bookmark.h" +#include "document.h" /* file_new_cb() */ +#include "filebrowser.h" +#include "fref.h" #include "gtk_easy.h" -#include "menu.h" /* menu_create_main(), recent_menu_init() */ -#include "bf_lib.h" /* get_int_from_string() */ -#include "pixmap.h" /* new_pixmap(); */ -#include "undo_redo.h" /* undo_cb() redo_cb() etc. */ -#include "snr2.h" /* search_cb, replace_cb */ -#include "html_table.h" #include "html.h" #include "html2.h" -#include "wizards.h" -#include "image.h" #include "html_form.h" -#include "filebrowser.h" -#include "stringlist.h" -#include "preferences.h" /* open_preferences_cb */ -#include "outputbox.h" /* init_outputbox() */ -#include "fref.h" -#include "bookmark.h" +#include "html_table.h" +#include "image.h" +#include "menu.h" /* menu_create_main(), recent_menu_init() */ +#include "outputbox.h" /* init_outputbox() */ +#include "pixmap.h" /* new_pixmap(); */ +#include "preferences.h" /* open_preferences_cb */ #include "project.h" +#include "snr2.h" /* search_cb, replace_cb */ +#include "stringlist.h" +#include "undo_redo.h" /* undo_cb() redo_cb() etc. */ +#include "wizards.h" #ifdef HAVE_ATLEAST_GTK_2_4 #include "quickstart.h" @@ -1638,7 +1638,6 @@ GdkColor color; splashscreen.window = window_with_title(CURRENT_VERSION_NAME, GTK_WIN_POS_CENTER_ALWAYS, 0); - gtk_window_set_default_icon_list(default_icon_list()); gtk_window_set_decorated(GTK_WINDOW(splashscreen.window), FALSE); gtk_window_set_role(GTK_WINDOW(splashscreen.window), "splash"); gtk_window_set_resizable(GTK_WINDOW(splashscreen.window),FALSE);