From 02faf1f43ad07b4c2469506614c2101ae762657d Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 26 Feb 2024 18:36:26 +0100 Subject: [PATCH] Maybe fixing weird menu texts (issue #1631) --- src/rba/rba/rba.cc | 2 +- src/rba/rba/rbaUtils.cc | 4 ++-- src/rba/rba/rbaUtils.h | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/rba/rba/rba.cc b/src/rba/rba/rba.cc index a4df7f04be..8bd642f040 100644 --- a/src/rba/rba/rba.cc +++ b/src/rba/rba/rba.cc @@ -2358,7 +2358,7 @@ RubyInterpreter::load_file (const std::string &filename_utf8) { std::string fl (rb_cstring_from_utf8 (filename_utf8)); - rb_set_progname (rb_str_new (fl.c_str (), long (fl.size ()))); + ruby_script (fl.c_str ()); rb_set_errinfo (Qnil); int error = 0; diff --git a/src/rba/rba/rbaUtils.cc b/src/rba/rba/rbaUtils.cc index ab9383ba94..f11463965e 100644 --- a/src/rba/rba/rbaUtils.cc +++ b/src/rba/rba/rbaUtils.cc @@ -530,10 +530,10 @@ VALUE rba_eval_string_in_context (const char *expr, const char *file, int line, rb_set_errinfo (Qnil); if (file) { - rb_set_progname (rb_str_new (file, long (strlen (file)))); + ruby_script (file); } else { const char *e = ""; - rb_set_progname (rb_str_new (e, long (strlen (e)))); + ruby_script (e); } int argc; diff --git a/src/rba/rba/rbaUtils.h b/src/rba/rba/rbaUtils.h index 3105f1dfc4..1f9e6b5d86 100644 --- a/src/rba/rba/rbaUtils.h +++ b/src/rba/rba/rbaUtils.h @@ -147,14 +147,6 @@ inline std::string rb_cstring_from_utf8 (const std::string &utf8) return utf8; } -/** - * @brief A setter for $0 - */ -inline void rb_set_progname (VALUE pn) -{ - rb_gv_set ("PROGRAM_NAME", pn); -} - /** * @brief Sets up a block for protected evaluation *