From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail
From: Stefan Kangas <stefan@marxist.se>
Newsgroups: gmane.emacs.bugs
Subject: bug#25032: 25.1; `bookmark-set-internal', `bookmark-set-no-overwrite'
Date: Tue, 2 Jul 2019 19:07:57 +0200
Message-ID: <CADwFkmnYkQDuCL_fH=Cst_GmXjXN+eE9Mwi-dOrB5-p6nRQoVw@mail.gmail.com>
References: <CADwFkmknRXCYxAouO8a3in1REUJkaXjMws50HyUKuJz4h=Vmhw@mail.gmail.com>
 <CADwFkmnCoj5PFBgUWy7iDHXza895gFaOnQ-0=fCQpczeG=i3yQ@mail.gmail.com>
 <83y31gcrh9.fsf@gnu.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="000000000000f9e603058cb5c927"
Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226";
	logging-data="118468"; mail-complaints-to="usenet@blaine.gmane.org"
Cc: 25032@debbugs.gnu.org
To: Eli Zaretskii <eliz@gnu.org>
Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jul 02 20:34:14 2019
Return-path: <bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org>
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 <bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org>)
	id 1hiNba-000Uel-9I
	for geb-bug-gnu-emacs@m.gmane.org; Tue, 02 Jul 2019 20:34:14 +0200
Original-Received: from localhost ([::1]:56204 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.86_2)
	(envelope-from <bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org>)
	id 1hiNbZ-0004eP-9D
	for geb-bug-gnu-emacs@m.gmane.org; Tue, 02 Jul 2019 14:34:13 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57281)
 by lists.gnu.org with esmtp (Exim 4.86_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hiMH9-0002if-2g
 for bug-gnu-emacs@gnu.org; Tue, 02 Jul 2019 13:09:04 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hiMH8-00040H-25
 for bug-gnu-emacs@gnu.org; Tue, 02 Jul 2019 13:09:03 -0400
Original-Received: from debbugs.gnu.org ([209.51.188.43]:39003)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1hiMH7-0003zv-T4
 for bug-gnu-emacs@gnu.org; Tue, 02 Jul 2019 13:09:01 -0400
Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hiMH7-0006ku-IL
 for bug-gnu-emacs@gnu.org; Tue, 02 Jul 2019 13:09:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Stefan Kangas <stefan@marxist.se>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@gnu.org
Resent-Date: Tue, 02 Jul 2019 17:09:01 +0000
Resent-Message-ID: <handler.25032.B25032.156208729625840@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 25032
X-GNU-PR-Package: emacs
Original-Received: via spool by 25032-submit@debbugs.gnu.org id=B25032.156208729625840
 (code B ref 25032); Tue, 02 Jul 2019 17:09:01 +0000
Original-Received: (at 25032) by debbugs.gnu.org; 2 Jul 2019 17:08:16 +0000
Original-Received: from localhost ([127.0.0.1]:47824 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1hiMGO-0006ii-1T
 for submit@debbugs.gnu.org; Tue, 02 Jul 2019 13:08:16 -0400
Original-Received: from mail-wr1-f48.google.com ([209.85.221.48]:35094)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <stefankangas@gmail.com>) id 1hiMGM-0006iK-Ok
 for 25032@debbugs.gnu.org; Tue, 02 Jul 2019 13:08:15 -0400
Original-Received: by mail-wr1-f48.google.com with SMTP id c27so11019513wrb.2
 for <25032@debbugs.gnu.org>; Tue, 02 Jul 2019 10:08:14 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:mime-version:references:in-reply-to:from:date
 :message-id:subject:to:cc;
 bh=Q4e83L7o9M1SAzF1qXw1i9fQU2Ppu/0V5shM4dhJOFo=;
 b=rdIwDHLmw2s76zu/nLq7t+AfmU9lq+hECov6DUJ2uDdMkxDEtQ0Ru889lp6oNb7o++
 15lNlbIxzmSXV/Oua91fhGsIqmtn4DgN5N1sJCXWQW50ixupExpFGyJRwQdknir2R6Q+
 /XQhidl5P4WrJK7cFvIa5cbt+3ujp3okOoNiqZjYgu2SKzaBCV95lPjJdR2+CnjtVSVx
 I3ZSPELURPDRyQBQVtW+K8U5tGsAGV5TF2G0EevukVNhWwDvOaPT3tk8VjaKr2rzns0L
 PPu60+BWtHc+s+3+240r72KS6PxdQmLY8yMsYIPhCxkZ5anQCuuHQZoUWbcMXiVOWTDG
 pLig==
X-Gm-Message-State: APjAAAVQI31ox5r+bh3Z0BF1RMF0KJkSGThDZ31Pfp+g+nlz5wZSN2ov
 +DTUzIx0YNQwPDZXLyOwnhi08Rn+u7gYYUxPwPM=
X-Google-Smtp-Source: APXvYqykfB410I0c26LV+nIzElljZPAAIXnsgCXUmGNlwcpPovKM6sekslGa8LcNSHEYKASAr9l+iQgwQYgcBi+52D4=
X-Received: by 2002:adf:eb49:: with SMTP id u9mr25500267wrn.215.1562087289109; 
 Tue, 02 Jul 2019 10:08:09 -0700 (PDT)
In-Reply-To: <83y31gcrh9.fsf@gnu.org>
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" <bug-gnu-emacs.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-gnu-emacs>,
 <mailto:bug-gnu-emacs-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-gnu-emacs>
List-Post: <mailto:bug-gnu-emacs@gnu.org>
List-Help: <mailto:bug-gnu-emacs-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-gnu-emacs>,
 <mailto:bug-gnu-emacs-request@gnu.org?subject=subscribe>
Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org
Original-Sender: "bug-gnu-emacs"
 <bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org>
Xref: news.gmane.org gmane.emacs.bugs:161974
Archived-At: <http://permalink.gmane.org/gmane.emacs.bugs/161974>

--000000000000f9e603058cb5c927
Content-Type: text/plain; charset="UTF-8"

Eli Zaretskii <eliz@gnu.org> writes:

> > +If OVERWRITE-OR-PUSH is nil, then raise an error if there is
>
> We use "signal an error".

Fixed.

> > +already a bookmark named NAME; if `overwrite', then replace any
> > +existing bookmark if there is one; if `push' then push the new
> > +bookmark onto the bookmark alist.
>
> It is generally better to precede a description of several optional
> behaviors with a short summary:
>
>   OVERWRITE-OR-PUSH controls what happens if there is already a
>   bookmark by that NAME: nil means signal an error, `overwrite' means
>   replace the existing bookmark, `push' means ...

Fixed.  Although I chose the wording "with the same name" rather than
"by that NAME", since the name could also come from the prompt.

Thanks for the review; attached an updated version.

Best regards,
Stefan Kangas

--000000000000f9e603058cb5c927
Content-Type: application/octet-stream; 
	name="0001-lisp-bookmark.el-bookmark-set-internal-Doc-fix.-Bug-2.patch"
Content-Disposition: attachment; 
	filename="0001-lisp-bookmark.el-bookmark-set-internal-Doc-fix.-Bug-2.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_jxm2f8sf0>
X-Attachment-Id: f_jxm2f8sf0

RnJvbSA3YjcyYzM2NDJmNGNjMDE3YjE0NzdiMDM3N2ZiMTc1MjZmMGRjMGY4IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5rYW5nYXNAZ21haWwuY29t
PgpEYXRlOiBUdWUsIDIgSnVsIDIwMTkgMDc6MDk6MTMgKzAyMDAKU3ViamVjdDogW1BBVENIXSAq
IGxpc3AvYm9va21hcmsuZWwgKGJvb2ttYXJrLXNldC1pbnRlcm5hbCk6IERvYyBmaXguCiAoQnVn
IzI1MDMyKQoKLS0tCiBsaXNwL2Jvb2ttYXJrLmVsIHwgMjkgKysrKysrKysrKysrKysrKystLS0t
LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMo
LSkKCmRpZmYgLS1naXQgYS9saXNwL2Jvb2ttYXJrLmVsIGIvbGlzcC9ib29rbWFyay5lbAppbmRl
eCBiYmVmMGE5MjdkLi5lMTkwNjQ5ZmQxIDEwMDY0NAotLS0gYS9saXNwL2Jvb2ttYXJrLmVsCisr
KyBiL2xpc3AvYm9va21hcmsuZWwKQEAgLTc2MywxOCArNzYzLDIzIEBAIGJvb2ttYXJrLW1pbmli
dWZmZXItcmVhZC1uYW1lLW1hcAogICAgIG1hcCkpCiAKIChkZWZ1biBib29rbWFyay1zZXQtaW50
ZXJuYWwgKHByb21wdCBuYW1lIG92ZXJ3cml0ZS1vci1wdXNoKQotICAiSW50ZXJhY3RpdmVseSBz
ZXQgYSBib29rbWFyayBuYW1lZCBOQU1FIGF0IHRoZSBjdXJyZW50IGxvY2F0aW9uLgotCi1CZWdp
biB0aGUgaW50ZXJhY3RpdmUgcHJvbXB0IHdpdGggUFJPTVBULCBmb2xsb3dlZCBieSBhIHNwYWNl
LCBhCi1nZW5lcmF0ZWQgZGVmYXVsdCBuYW1lIGluIHBhcmVudGhlc2VzLCBhIGNvbG9uIGFuZCBh
IHNwYWNlLgotCi1JZiBPVkVSV1JJVEUtT1ItUFVTSCBpcyBuaWwsIHRoZW4gZXJyb3IgaWYgdGhl
cmUgaXMgYWxyZWFkeSBhCi1ib29rbWFyayBuYW1lZCBOQU1FOyBpZiBgb3ZlcndyaXRlJywgdGhl
biByZXBsYWNlIGFueSBleGlzdGluZwotYm9va21hcmsgaWYgdGhlcmUgaXMgb25lOyBpZiBgcHVz
aCcgdGhlbiBwdXNoIHRoZSBuZXcgYm9va21hcmsKLW9udG8gdGhlIGJvb2ttYXJrIGFsaXN0LiAg
VGhlIGBwdXNoJyBiZWhhdmlvciBtZWFucyB0aGF0IGFtb25nCi1ib29rbWFya3MgbmFtZWQgTkFN
RSwgdGhpcyBtb3N0IHJlY2VudGx5IHNldCBvbmUgYmVjb21lcyB0aGUgb25lIGluCi1lZmZlY3Qs
IGJ1dCB0aGUgb3RoZXJzIGFyZSBzdGlsbCB0aGVyZSwgaW4gb3JkZXIsIGlmIHRoZSB0b3Btb3N0
IG9uZQotaXMgZXZlciBkZWxldGVkLiIKKyAgIlNldCBhIGJvb2ttYXJrIHVzaW5nIHNwZWNpZmll
ZCBOQU1FIG9yIHByb21wdGluZyB3aXRoIFBST01QVC4KK1RoZSBib29rbWFyayBpcyBzZXQgYXQg
dGhlIGN1cnJlbnQgbG9jYXRpb24uCisKK0lmIE5BTUUgaXMgbm9uLW5pbCwgdXNlIGl0IGFzIHRo
ZSBuYW1lIG9mIHRoZSBuZXcgYm9va21hcmsuICBJbgordGhpcyBjYXNlLCB0aGUgdmFsdWUgb2Yg
UFJPTVBUIGlzIGlnbm9yZWQuCisKK090aGVyd2lzZSwgcHJvbXB0IHRoZSB1c2VyIGZvciB0aGUg
Ym9va21hcmsgbmFtZS4gIEJlZ2luIHRoZQoraW50ZXJhY3RpdmUgcHJvbXB0IHdpdGggUFJPTVBU
LCBmb2xsb3dlZCBieSBhIHNwYWNlLCBhIGdlbmVyYXRlZAorZGVmYXVsdCBuYW1lIGluIHBhcmVu
dGhlc2VzLCBhIGNvbG9uIGFuZCBhIHNwYWNlLgorCitPVkVSV1JJVEUtT1ItUFVTSCBjb250cm9s
cyB3aGF0IGhhcHBlbnMgaWYgdGhlcmUgaXMgYWxyZWFkeSBhCitib29rbWFyayB3aXRoIHRoZSBz
YW1lIG5hbWU6IG5pbCBtZWFucyBzaWduYWwgYW4gZXJyb3I7Citgb3ZlcndyaXRlJyBtZWFucyBy
ZXBsYWNlIGFueSBleGlzdGluZyBib29rbWFyazsgYHB1c2gnIG1lYW5zCitwdXNoIHRoZSBuZXcg
Ym9va21hcmsgb250byB0aGUgYm9va21hcmsgYWxpc3QuICBUaGUgYHB1c2gnCitiZWhhdmlvciBt
ZWFucyB0aGF0IGFtb25nIGJvb2ttYXJrcyB3aXRoIHRoZSBzYW1lIG5hbWUsIHRoaXMgbW9zdAor
cmVjZW50bHkgc2V0IG9uZSBiZWNvbWVzIHRoZSBvbmUgaW4gZWZmZWN0LCBidXQgdGhlIG90aGVy
cyBhcmUKK3N0aWxsIHRoZXJlLCBpbiBvcmRlciwgaWYgdGhlIHRvcG1vc3Qgb25lIGlzIGV2ZXIg
ZGVsZXRlZC4iCiAgICh1bndpbmQtcHJvdGVjdAogICAgICAgIChsZXQqICgocmVjb3JkIChib29r
bWFyay1tYWtlLXJlY29yZCkpCiAgICAgICAgICAgICAgIDs7IGBkZWZhdWx0cycgaXMgYSB0cmFu
c2llbnQgZWxlbWVudCBvZiB0aGUKLS0gCjIuMjEuMAoK
--000000000000f9e603058cb5c927--