From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by sourceware.org (Postfix) with ESMTPS id 85DFE3858C50 for ; Mon, 10 Jun 2024 19:50:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 85DFE3858C50 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 85DFE3858C50 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718049026; cv=none; b=OYToGFwWCuropjGlRTUinfJ31IycTR6I20xY1QwDUyEH/WAYMQraSVq9C+HWkpSRTClCg82bRQXNqD+6eSHY1ziXyTUpGrQmxORvV3XnGrVP6bRO2AUh+QF4UX2TpheNdfQc8A5KKNOkwzeBZF1L5IVgxzVyizLtnvpl6BgB0Pw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718049026; c=relaxed/simple; bh=gr7VMHwbndZ2xLIDLs2ddx6014T/mk1GbWhS6vEkZd8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=S/3vzJX8y9YKv5pGM6vYwubX1+PbrRSemoWdJTNxlaar1iya/b9hz/KvMOnkHEcBxqjBi0v2Gk+dw1RKhdgM1+HBNm/v/x65v0XwpA0E5wYs2lxpNFc6gMN9ZjvUrKmPqoX45rBjOWKFl5OTJaHS6WYrd/8rR18ZlYoKsP3CZl8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-7eb7a2f062cso13854639f.0 for ; Mon, 10 Jun 2024 12:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1718049024; x=1718653824; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=2++n7JITYfl1fggYsreq+yO29MzHDPhj1aCLzVmY0DA=; b=L0tFTNsVW+ANDgzgIg2aasGQFy0XQa5onu6N5xt9nnsOPK2UqjmdO2NwfUBu36v8p8 l2oAD7O/IbgH+DhJdUgYE7KB71wan01ufpRAu4i7jQ1fCuNRowCQYJ1SH/aU1SxKYz55 8woOXxX8bDpWIKZK4tFI4ZvQnagO/kwCZmGPmItVICjz6TybO0YsIRPMZINV6xGpXBjz FMKzjsqHZESWr5ngPPeP/FbkH4sogPSoimxtlAOEYNFLjg7YG7N2k6CwPLL4yzHHVZ1w 4L6C63ArZZSuuxosttL/HMgN75hoNYgxS+pxS0m0Zt2cb7PZU9ZH4k/rwnzS1qys1aPn XqxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718049024; x=1718653824; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2++n7JITYfl1fggYsreq+yO29MzHDPhj1aCLzVmY0DA=; b=VAPrxXppAV0ASdj+RzRNkB7aioNAVeen6H+c8H7ETxInEVT8z6GN0qNDo+lIOXOhpW anCh5jGwkXCb4GSqpbXB5iZW56GSeNg1V/c9gQCBXciAPsUjDQHrwhFhUAsY237KXMep /UcGPca+hR61t5Zwa03HBtHopER+3hD34KzrHWjhtXuqOVNRO5Qva8v6SRm+seUpNbaQ bPuw8Ku5fHyophun+gCFyy96hSbaBgbclYfflDQ73Yacii92hgsV5QS8SgAUexNpVO24 aYJ+V2nHQmirXLY4gBD6YiO2OAlcc+NRGdkUN0Nc0sy3bjHHtUXRkW+ZgrKhlaM9gptt oJVA== X-Gm-Message-State: AOJu0YzOBOimRUQVqCJzZevs5uxznNs7r7Tl+rGl1D1w9PsxXdar3rMX DBwq/kYhOPLKzkvRioyblWAb3TCP+zgNh4tMey5n6TYxPQKlsU7fChZ5jdcg3qIVQYRa7T91Gxs = X-Google-Smtp-Source: AGHT+IFHhMRpRhlXmG6YOe3rXvgr0TBwkZL4vsUtbSu+/0BoKhPl8s2sjKAfoqA/6hZVA0RvQqQrNg== X-Received: by 2002:a05:6602:168a:b0:7ea:fd77:c2b7 with SMTP id ca18e2360f4ac-7eb5724acc7mr1081486139f.13.1718049024481; Mon, 10 Jun 2024 12:50:24 -0700 (PDT) Received: from localhost.localdomain (75-166-134-4.hlrn.qwest.net. [75.166.134.4]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-7eb76e538a1sm122556439f.30.2024.06.10.12.50.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jun 2024 12:50:24 -0700 (PDT) From: Tom Tromey Date: Mon, 10 Jun 2024 13:50:22 -0600 Subject: [PATCH v2 1/7] Call gdbpy_fix_doc_string_indentation for function help MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240610-doc-string-cols-v2-1-5cc5af186d4b@adacore.com> References: <20240610-doc-string-cols-v2-0-5cc5af186d4b@adacore.com> In-Reply-To: <20240610-doc-string-cols-v2-0-5cc5af186d4b@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.13.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: If you invoke "help function _caller_is", you'll see that the help text is indented strangely. The fix for this is to add a call to gdbpy_fix_doc_string_indentation in the appropriate spot, as is already done for Python commands and parameters. --- gdb/python/py-function.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c index 2bbfb9d3a6d..952f03bb77c 100644 --- a/gdb/python/py-function.c +++ b/gdb/python/py-function.c @@ -120,6 +120,8 @@ fnpy_init (PyObject *self, PyObject *args, PyObject *kwds) docstring = python_string_to_host_string (ds_obj.get ()); if (docstring == NULL) return -1; + docstring + = gdbpy_fix_doc_string_indentation (std::move (docstring)); } } } -- 2.44.0