From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] emacs-24 r117265: Fix bug #17801 with extraneous newlines after inserting markup in Texinfo mode. Date: Fri, 20 Jun 2014 22:24:14 +0300 Message-ID: <83egyjqt9d.fsf@gnu.org> References: <83vbrvr760.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1403292290 12571 80.91.229.3 (20 Jun 2014 19:24:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Jun 2014 19:24:50 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 20 21:24:43 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Wy4QT-00064r-8w for ged-emacs-devel@m.gmane.org; Fri, 20 Jun 2014 21:24:41 +0200 Original-Received: from localhost ([::1]:42578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy4QS-0003QY-RI for ged-emacs-devel@m.gmane.org; Fri, 20 Jun 2014 15:24:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy4QL-0003QJ-0Z for emacs-devel@gnu.org; Fri, 20 Jun 2014 15:24:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wy4QF-0007JX-R0 for emacs-devel@gnu.org; Fri, 20 Jun 2014 15:24:32 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:35190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy4QF-0007JP-J4 for emacs-devel@gnu.org; Fri, 20 Jun 2014 15:24:27 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0N7H00O00E18AT00@mtaout27.012.net.il> for emacs-devel@gnu.org; Fri, 20 Jun 2014 22:21:17 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N7H00J6LF3H1E60@mtaout27.012.net.il>; Fri, 20 Jun 2014 22:21:17 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:172589 Archived-At: > From: Stefan Monnier > Cc: emacs-devel@gnu.org > Date: Fri, 20 Jun 2014 11:50:40 -0400 > > >> > - \n _ \n "@end " str \n) > >> > + \n _ \n "@end " str \n \n) > >> I think these extra \n should not be added. > > If you mean that "\n" should have been used instead, then I agree and > > will change these. But if you mean these skeletons should not insert > > newlines unconditionally, then please explain, because I tested these > > changes and found them to DTRT. > > I think they should end with a single \n and nothing more, so they won't > add a newline when there's one already. I added another \n in 4 cases: texinfo-insert-block, texinfo-insert-@end, texinfo-insert-@example, and texinfo-insert-@quotation. All of these should have an empty line after them. So I think I disagree with what you say, and these changes are actually correct. In any case, "at eol" and "there is already a newline" is not the same. skeleton.el tests the former, which doesn't mean there's a newline.