From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#26328: 26.0.50; checkdoc action for join lines drops final " Date: Fri, 26 Jul 2019 12:51:23 +0200 Message-ID: <878sslnk5w.fsf@mouse.gnus.org> References: <84y3vkqzmd.fsf@tm6592> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="172776"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 26328@debbugs.gnu.org To: Marco Wahl Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jul 26 12:52:13 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hqxpc-000ikv-3W for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Jul 2019 12:52:12 +0200 Original-Received: from localhost ([::1]:38392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqxpa-0002hC-PK for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Jul 2019 06:52:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51326) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqxpX-0002do-3W for bug-gnu-emacs@gnu.org; Fri, 26 Jul 2019 06:52:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqxpT-0003Eg-Pb for bug-gnu-emacs@gnu.org; Fri, 26 Jul 2019 06:52:06 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60359) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hqxpS-0003Cm-A9 for bug-gnu-emacs@gnu.org; Fri, 26 Jul 2019 06:52:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hqxpS-00056n-7I for bug-gnu-emacs@gnu.org; Fri, 26 Jul 2019 06:52:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 Jul 2019 10:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26328 X-GNU-PR-Package: emacs Original-Received: via spool by 26328-submit@debbugs.gnu.org id=B26328.156413828919565 (code B ref 26328); Fri, 26 Jul 2019 10:52:02 +0000 Original-Received: (at 26328) by debbugs.gnu.org; 26 Jul 2019 10:51:29 +0000 Original-Received: from localhost ([127.0.0.1]:40941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hqxov-00055V-Bd for submit@debbugs.gnu.org; Fri, 26 Jul 2019 06:51:29 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:59522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hqxot-00055K-KL for 26328@debbugs.gnu.org; Fri, 26 Jul 2019 06:51:28 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=marnie) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hqxop-0005bB-F6; Fri, 26 Jul 2019 12:51:25 +0200 In-Reply-To: <84y3vkqzmd.fsf@tm6592> (Marco Wahl's message of "Sat, 01 Apr 2017 10:51:54 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:163762 Archived-At: Marco Wahl writes: > Checkdoc drops the final " when the action to join the lines has been > choosen. > > E.g. have checkdoc enabled and eval > > (defun foo () > "bla bla > bla." > ) > > Suggestion for a fix: > > modified lisp/emacs-lisp/checkdoc.el > @@ -1520,7 +1520,7 @@ checkdoc-this-string-valid-engine > ;; They said yes. We have more fill work to do... > (goto-char (match-beginning 1)) > (delete-region (point) (match-end 1)) > - (insert "\n") > + (insert "\"") > (setq msg nil)))))) > (if msg > (checkdoc-create-error msg s (save-excursion The " at the end of the doc string is removed by that `delete-region', so it's all a bit confusing. The following patch also fixes the problem in this example, but I'm not quite sure what the code is attempting to do here. Anybody familiar with this code? diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 830743f5f8..7ac557711a 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1498,12 +1498,7 @@ checkdoc-this-string-valid-engine p (1+ p) "1st line not a complete sentence. Join these lines? " " " t) - (progn - ;; They said yes. We have more fill work to do... - (goto-char (match-beginning 1)) - (delete-region (point) (match-end 1)) - (insert "\n") - (setq msg nil)))))) + (setq msg nil))))) (if msg (checkdoc-create-error msg s (save-excursion (goto-char s) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no