From 38ddcbe73bb2c8cf439b019bfe2d0e44689d0acf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerd=20M=C3=B6llmann?= Date: Fri, 26 Apr 2024 12:25:28 +0200 Subject: [PATCH] Fix gud-lldb-command-name * lisp/progmodes/gud.el (gud-gud-lldb-command-name): Change to gud-lldb-command-name. (lldb): Don't do stuff that is not needed for lldb. (cherry picked from commit 763eaa5a324ff51dddad32d725ec8d416597d6d5) --- lisp/progmodes/gud.el | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 90fdc99c7e2..c16d78c5097 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -3854,12 +3854,12 @@ so they have been disabled.")) expr)))))))) -;; 'gud-lldb-history' and 'gud-gud-lldb-command-name' are required +;; 'gud-lldb-history' and 'gud-lldb-command-name' are required ;; because 'gud-symbol' uses their values if they are present. Their ;; names are deduced from the minor-mode name. (defvar gud-lldb-history nil) -(defcustom gud-gud-lldb-command-name "lldb" +(defcustom gud-lldb-command-name "lldb" "Default command to invoke LLDB in order to debug a program with it." :type 'string :version "30.1") @@ -4057,15 +4057,6 @@ consider to turn them off in this mode. This command runs functions from `lldb-mode-hook'." (interactive (list (gud-query-cmdline 'lldb))) - - (when (and gud-comint-buffer - (buffer-name gud-comint-buffer) - (get-buffer-process gud-comint-buffer) - (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gud-lldb))) - (gdb-restore-windows) - ;; FIXME: Copied from gud-gdb, but what does that even say? - (error "Multiple debugging requires restarting in text command mode")) - (gud-common-init command-line nil 'gud-lldb-marker-filter) (setq-local gud-minor-mode 'lldb) -- 2.39.5