From 7eb86a1788aebe70f7a111673bfc31d11d0e8612 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 4 Jan 2022 01:30:27 +0000 Subject: [PATCH] Fix duplicate file panel display on Haiku * lisp/term/haiku-win.el (x-file-dialog): Fix up prompt to look better. * src/haiku_support.cc (be_popup_file_dialog): Remove duplicate call to `Show'. --- lisp/term/haiku-win.el | 5 ++++- src/haiku_support.cc | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el index c219ab2944f..f3c94db6a36 100644 --- a/lisp/term/haiku-win.el +++ b/lisp/term/haiku-win.el @@ -114,7 +114,10 @@ If TYPE is nil, return \"text/plain\"." (defun x-file-dialog (prompt dir default_filename mustmatch only_dir_p) "SKIP: real doc in xfns.c." (if (eq (framep-on-display (selected-frame)) 'haiku) - (haiku-read-file-name prompt (selected-frame) + (haiku-read-file-name (if (not (string-suffix-p ": " prompt)) + prompt + (substring prompt 0 (- (length prompt) 2))) + (selected-frame) (or dir (and default_filename (file-name-directory default_filename))) mustmatch only_dir_p diff --git a/src/haiku_support.cc b/src/haiku_support.cc index 04470a3b96e..74e9765903e 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc @@ -2682,7 +2682,6 @@ be_popup_file_dialog (int open_p, const char *default_dir, int must_match_p, int be_popup_file_dialog_safe_set_target (panel, w); panel->Show (); - panel->Window ()->Show (); unblock_input_function (); void *buf = alloca (200); -- 2.39.5