From 14c8a95f905edb5d6c16cdb3edc11cdbf531674a Mon Sep 17 00:00:00 2001 From: vdhoeven Date: Sat, 13 Jun 2009 22:14:08 +0000 Subject: [PATCH] Fixes git-svn-id: svn://svn.savannah.gnu.org/texmacs/trunk@2725 64cb5145-927a-446d-8aed-2fb7b4773692 --- src/TeXmacs/progs/graphics/graphics-main.scm | 3 ++- src/src/Edit/Interface/edit_footer.cpp | 6 ++++-- src/src/Edit/Interface/edit_keyboard.cpp | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/TeXmacs/progs/graphics/graphics-main.scm b/src/TeXmacs/progs/graphics/graphics-main.scm index 3dd989a4..d70bf5d7 100644 --- a/src/TeXmacs/progs/graphics/graphics-main.scm +++ b/src/TeXmacs/progs/graphics/graphics-main.scm @@ -411,7 +411,8 @@ (tm-define (graphics-interactive-set-grid-nsubds visual?) (:interactive #t) - (interactive (lambda (x) (graphics-set-grid-aspect 'detailed x visual?)) + (interactive + (lambda (x) (graphics-set-grid-aspect 'detailed (string->number x) visual?)) "Number of subunit steps")) ;; Setting visual grid aspect properties (colors) diff --git a/src/src/Edit/Interface/edit_footer.cpp b/src/src/Edit/Interface/edit_footer.cpp index 17c6627c..f0a3a434 100644 --- a/src/src/Edit/Interface/edit_footer.cpp +++ b/src/src/Edit/Interface/edit_footer.cpp @@ -380,8 +380,10 @@ edit_interface_rep::set_footer () { set_right_footer(); } else { - set_left_footer (message_l); - set_right_footer (message_r); + if (message_l == "") set_left_footer (); + else set_left_footer (message_l); + if (message_r == "") set_right_footer (); + else set_right_footer (message_r); message_l= message_r= ""; } } diff --git a/src/src/Edit/Interface/edit_keyboard.cpp b/src/src/Edit/Interface/edit_keyboard.cpp index 2aee79ff..8970bef0 100644 --- a/src/src/Edit/Interface/edit_keyboard.cpp +++ b/src/src/Edit/Interface/edit_keyboard.cpp @@ -96,6 +96,7 @@ edit_interface_rep::try_shortcut (string comb) { mark_start (sh_mark); string rew= sv->kbd_post_rewrite (sh_s); if (N(help)>0) set_message (help, rew); + else if (shorth == rew) set_message ("keyboard shorthand: " * rew); else set_message ("keyboard shorthand: " * rew, shorth); if ((status & 1) == 1) cmd (); else if (N(shorth) > 0) insert_tree (shorth); -- 2.11.4.GIT