From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: master 38d8db1 2/2: ; * etc/NEWS: Small cleanup.
Date: Thu, 13 Jun 2019 19:12:57 +0300
Message-ID: <83k1dpzcom.fsf@gnu.org>
References: <20190613140525.13770.7697@vcs0.savannah.gnu.org>
 <20190613140527.30338209A7@vcs0.savannah.gnu.org> <87lfy54jn7.fsf@gmx.de>
Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226";
	logging-data="102369"; mail-complaints-to="usenet@blaine.gmane.org"
Cc: stefankangas@gmail.com, emacs-devel@gnu.org
To: Michael Albinus <michael.albinus@gmx.de>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 13 20:07:01 2019
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1hbU7p-000QPk-FK
	for ged-emacs-devel@m.gmane.org; Thu, 13 Jun 2019 20:07:01 +0200
Original-Received: from localhost ([::1]:43240 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.86_2)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1hbU7o-000358-1v
	for ged-emacs-devel@m.gmane.org; Thu, 13 Jun 2019 14:07:00 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46361)
 by lists.gnu.org with esmtp (Exim 4.86_2)
 (envelope-from <eliz@gnu.org>) id 1hbSLW-0006D5-BM
 for emacs-devel@gnu.org; Thu, 13 Jun 2019 12:13:03 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:35222)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
 id 1hbSLV-0001B8-Mq; Thu, 13 Jun 2019 12:13:01 -0400
Original-Received: from [176.228.60.248] (port=3115 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <eliz@gnu.org>)
 id 1hbSLR-0002CE-05; Thu, 13 Jun 2019 12:12:58 -0400
In-reply-to: <87lfy54jn7.fsf@gmx.de> (message from Michael Albinus on Thu, 13
 Jun 2019 16:58:20 +0200)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: "Emacs-devel" <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Xref: news.gmane.org gmane.emacs.devel:237534
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/237534>

> From: Michael Albinus <michael.albinus@gmx.de>
> Date: Thu, 13 Jun 2019 16:58:20 +0200
> Cc: Stefan Kangas <stefankangas@gmail.com>
> 
> > -+++
> > -*** 'bookmark-file' is now an obsolete alias of
> > -'bookmark-default-file'.
> > -
> > -** Bookmarks
> > -
> >  ---
> > -*** 'bookmark-old-default-file' is now an obsolete alias of
> > -'bookmark-default-file'.
> > +*** 'bookmark-file' and 'bookmark-old-default-file' are now obsolete
> > +aliases of 'bookmark-default-file'.
> 
> I haven't checked in detail, but the first entry was marked "+++", and
> the second "---". Is it correct to merge both entries and mark them "---"?

No, the marks should follow the respective entries.