Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tilde for openSUSE:Factory checked in at 2022-08-29 15:16:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tilde (Old) and /work/SRC/openSUSE:Factory/.tilde.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tilde" Mon Aug 29 15:16:35 2022 rev:11 rq:999940 version:1.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/tilde/tilde.changes 2020-06-06 23:39:16.568891697 +0200 +++ /work/SRC/openSUSE:Factory/.tilde.new.2083/tilde.changes 2022-08-29 15:16:36.841995512 +0200 @@ -1,0 +2,7 @@ +Mon Aug 29 09:53:30 UTC 2022 - Jan Engelhardt <[email protected]> + +- Update to release 1.1.3 + * The file name in the info line would not be displayed as + intended if it contained double-width characters. + +------------------------------------------------------------------- Old: ---- tilde-1.1.2.tar.bz2 tilde-1.1.2.tar.bz2.sig New: ---- tilde-1.1.3.tar.bz2 tilde-1.1.3.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tilde.spec ++++++ --- /var/tmp/diff_new_pack.lwEXWD/_old 2022-08-29 15:16:37.345996527 +0200 +++ /var/tmp/diff_new_pack.lwEXWD/_new 2022-08-29 15:16:37.349996535 +0200 @@ -1,7 +1,7 @@ # # spec file for package tilde # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: tilde -Version: 1.1.2 +Version: 1.1.3 Release: 0 Summary: A text editor for the terminal License: GPL-3.0-only ++++++ tilde-1.1.2.tar.bz2 -> tilde-1.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tilde-1.1.2/Changelog new/tilde-1.1.3/Changelog --- old/tilde-1.1.2/Changelog 2020-05-24 11:17:53.000000000 +0200 +++ new/tilde-1.1.3/Changelog 2022-01-29 17:56:35.000000000 +0100 @@ -1,3 +1,8 @@ +Version 1.1.3: + Bug fixes: + - The file name in the info line would not be displayed as intended if it contained + double-width characters. + Version 1.1.2: Bug fixes: - When continuing reading after detecting an invalid character conversion, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tilde-1.1.2/man/tilde.1 new/tilde-1.1.3/man/tilde.1 --- old/tilde-1.1.2/man/tilde.1 2020-05-24 11:17:53.000000000 +0200 +++ new/tilde-1.1.3/man/tilde.1 2022-01-29 17:56:35.000000000 +0100 @@ -1,5 +1,5 @@ .\" Generated by manscript from tilde.1.txt -.TH "TILDE" "1" "2018/03/18" "1.1.2" "An intuitive terminal text editor" +.TH "TILDE" "1" "2018/03/18" "1.1.3" "An intuitive terminal text editor" .SH NAME tilde \- an intuitive text editor for the console/terminal .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tilde-1.1.2/src/dialogs/optionsdialog.cc new/tilde-1.1.3/src/dialogs/optionsdialog.cc --- old/tilde-1.1.2/src/dialogs/optionsdialog.cc 2020-05-24 11:17:53.000000000 +0200 +++ new/tilde-1.1.3/src/dialogs/optionsdialog.cc 2022-01-29 17:56:35.000000000 +0100 @@ -144,7 +144,7 @@ void buffer_options_dialog_t::set_view_values(file_edit_window_t *view) { int tabsize = atoi(tabsize_field->get_text().c_str()); - if (tabsize > 0 || tabsize < 17) { + if (tabsize > 0 && tabsize < 17) { view->set_tabsize(tabsize); } view->set_wrap(wrap_box->get_state() ? wrap_type_t::WORD : wrap_type_t::NONE); @@ -170,7 +170,7 @@ void buffer_options_dialog_t::set_options_from_values() { int tabsize = atoi(tabsize_field->get_text().c_str()); - if (tabsize > 0 || tabsize < 17) { + if (tabsize > 0 && tabsize < 17) { default_option.tabsize = option.tabsize = tabsize; } default_option.wrap = option.wrap = wrap_box->get_state(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tilde-1.1.2/src/fileeditwindow.cc new/tilde-1.1.3/src/fileeditwindow.cc --- old/tilde-1.1.2/src/fileeditwindow.cc 2020-05-24 11:17:53.000000000 +0200 +++ new/tilde-1.1.3/src/fileeditwindow.cc 2022-01-29 17:56:35.000000000 +0100 @@ -13,6 +13,7 @@ */ #include "tilde/fileeditwindow.h" #include "tilde/fileautocompleter.h" +#include "tilde/log.h" #include "tilde/main.h" file_edit_window_t::file_edit_window_t(file_buffer_t *_text) { @@ -42,13 +43,19 @@ text_line_t *name_line = _text->get_name_line(); text_line_t::paint_info_t paint_info; int name_width = info_window.get_width(); + text_pos_t screen_width = name_line->calculate_screen_width(0, name_line->size(), 1); info_window.set_paint(0, 0); info_window.set_default_attrs(get_attribute(attribute_t::MENUBAR)); - if (name_line->calculate_screen_width(0, name_line->size(), 1) > name_width) { + if (screen_width > name_width) { + paint_info.start = 0; info_window.addstr("..", 0); - paint_info.start = name_line->adjust_position(name_line->size(), -(name_width - 2)); + + while (screen_width > name_width - 2) { + screen_width -= name_line->width_at(paint_info.start); + paint_info.start = name_line->adjust_position(paint_info.start, 1); + } paint_info.size = name_width - 2; } else { paint_info.start = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tilde-1.1.2/src/main.cc new/tilde-1.1.3/src/main.cc --- old/tilde-1.1.2/src/main.cc 2020-05-24 11:17:53.000000000 +0200 +++ new/tilde-1.1.3/src/main.cc 2022-01-29 17:56:35.000000000 +0100 @@ -239,7 +239,7 @@ about_dialog->set_max_text_height(13); about_dialog->set_message( // clang-format off - "Tilde - The intuitive text editor\n\nVersion 1.1.2\n" + "Tilde - The intuitive text editor\n\nVersion 1.1.3\n" "Copyright (c) 2011-2018 G.P. Halkes\n\n" // @copyright "The Tilde text editor is licensed under the GNU General Public License version 3. " "You should have received a copy of the GNU General Public License along with this program. " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tilde-1.1.2/src/option.cc new/tilde-1.1.3/src/option.cc --- old/tilde-1.1.2/src/option.cc 2020-05-24 11:17:53.000000000 +0200 +++ new/tilde-1.1.3/src/option.cc 2022-01-29 17:56:35.000000000 +0100 @@ -172,7 +172,7 @@ static void print_version() { printf( - "Tilde version 1.1.2\n" + "Tilde version 1.1.3\n" "Copyright (c) 2011-2018 G.P. Halkes\n" // @copyright "Tilde is licensed under the GNU General Public License version 3\n"); printf(
