From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Liu Hui Newsgroups: gmane.emacs.bugs Subject: bug#62413: 29.0.60; [PATCH] save-place-mode cannot restore saved position Date: Sat, 25 Mar 2023 22:14:02 +0800 Message-ID: References: <83tty9caku.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000dbbd6105f7ba1fa2" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16963"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 62413@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Mar 25 15:23:45 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pg4o5-00042o-CA for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 25 Mar 2023 15:23:45 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pg4nS-0002Zg-Mw; Sat, 25 Mar 2023 10:23:06 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pg4nQ-0002Yn-M1 for bug-gnu-emacs@gnu.org; Sat, 25 Mar 2023 10:23:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pg4nO-0004hH-E8 for bug-gnu-emacs@gnu.org; Sat, 25 Mar 2023 10:23:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pg4nO-0008Ol-8h for bug-gnu-emacs@gnu.org; Sat, 25 Mar 2023 10:23:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Liu Hui Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 25 Mar 2023 14:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62413 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 62413-submit@debbugs.gnu.org id=B62413.167975415532231 (code B ref 62413); Sat, 25 Mar 2023 14:23:02 +0000 Original-Received: (at 62413) by debbugs.gnu.org; 25 Mar 2023 14:22:35 +0000 Original-Received: from localhost ([127.0.0.1]:43193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pg4mx-0008Nm-7G for submit@debbugs.gnu.org; Sat, 25 Mar 2023 10:22:35 -0400 Original-Received: from mail-oa1-f49.google.com ([209.85.160.49]:40955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pg4mv-0008NS-0g for 62413@debbugs.gnu.org; Sat, 25 Mar 2023 10:22:33 -0400 Original-Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-177b78067ffso4705322fac.7 for <62413@debbugs.gnu.org>; Sat, 25 Mar 2023 07:22:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679754143; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=f5u4KLWwpFq1MlWdEwY6bVyy/pWT+tUfCYKKDDBO+P0=; b=qaGz65M5jOaTkY4mQh3l6Y8DDl62sD9Zf1Dp6Gl5f/LSdRcYxEfJmE7Un9b60fKGcg rTQJW8jrbC63p3j35brJQkDNp6h5VGPuZio28v5tVbprHaxA49zawbp+imik2XNc2ajw glBwydgkkYMTp+lDheltPItHxqD39jeEyEV7WRXglfOCecyLhzLAXr2XK3PKYJyswkzC ZMQqYQ4scfTQ3NnMBhvkJSpnCYVdIn2564Ytvo1bMxXU1EApEj595r6m13Q/DFrHu0oZ oJP3TGKToJqtSdx9Xuosng714c+ZNJt7gMalQ4yyUYpG1jlUgulf1Ym3ByCRsqE4XRnE fr9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679754143; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=f5u4KLWwpFq1MlWdEwY6bVyy/pWT+tUfCYKKDDBO+P0=; b=0Z8P/3gjYXWX7PGxFDl5iXQ/hbtPBcKvOWSSMRjYQTcYgMOK9Maa7K5O1plg2RSdC8 aLemLMQvHKWUJDDdD+ZbDAuM/svHm0ZrfBEaTHLRXDQPe6bZjeB4vAuu3shOxJqjq/w9 h4gj8fgXs+hma6+isULol3VL1B5O1P4K5XxL3ftLJA/U9JtewXjLsD4z4j+kp85+z9Dr FftghFTPDUEEuEbb17vTGF0+22X4ZOUkaJzZCG15DXo7NtnK2Z6MQwvP6baSEdR8JmL4 cO3UDOokyarmTTOoBeX+h+r9jx5LC+ZbhEU6di1Ej1gaE6eUmdGnu1O523s3OBlCZELP EBKA== X-Gm-Message-State: AAQBX9fPz35pvgr/cdIsnkpwPJ1G3zCdvxhq4pJzEXcx28SLtGpR5/ki n7rOaLYxzYLOkzhFDEnc0IcXqbOSHHzOKI+LNGyb0m9k X-Google-Smtp-Source: AK7set+/otACltJT5eLSYQYb6z4nTYL4TPLE4tZxGSXNNB/kwGzAtPCNdYOyAid1MEZyvse5r6Jxr57QHKm1ybLb26g= X-Received: by 2002:a4a:e602:0:b0:538:d154:cbc2 with SMTP id f2-20020a4ae602000000b00538d154cbc2mr2135261oot.1.1679753654017; Sat, 25 Mar 2023 07:14:14 -0700 (PDT) In-Reply-To: <83tty9caku.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:258583 Archived-At: --000000000000dbbd6105f7ba1fa2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable =E5=9C=A8 2023/3/25 19:52, Eli Zaretskii =E5=86=99=E9=81=93: >> --- a/lisp/saveplace.el >> +++ b/lisp/saveplace.el >> @@ -353,8 +353,11 @@ save-place-find-file-hook >> "Function added to `find-file-hook' by `save-place-mode'. >> It runs the hook `save-place-after-find-file-hook'." >> (or save-place-loaded (save-place-load-alist-from-file)) >> - (let ((cell (assoc buffer-file-name save-place-alist))) >> + (let* ((item (if (and (stringp buffer-file-name) >> + save-place-abbreviate-file-names) >> + (abbreviate-file-name buffer-file-name) >> + buffer-file-name)) >> + (cell (assoc item save-place-alist))) > > Wouldn't it be best to always test for abbreviated file name if the > full file name fails to match? E.g., it could be that the user turned > on save-place-abbreviate-file-names for a while, then turned it off > (or vice versa), thus causing mixed file names in the saved history. > It would also make the code simpler, I think. I agree that it is better to consider mixed file names. Please see the updated patch. --000000000000dbbd6105f7ba1fa2 Content-Type: application/x-patch; name="0001-Restore-positions-for-abbreviated-file-names-in-save.patch" Content-Disposition: attachment; filename="0001-Restore-positions-for-abbreviated-file-names-in-save.patch" Content-Transfer-Encoding: base64 Content-ID: <> X-Attachment-Id: RnJvbSBhZDVmMmQ0ZjNjODc4YTE1YzJmZDFkMmVjYTA5ZTJmMmZiZWNlYzE1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUgSHVpIDxsaXVodWkxNjEwQGdtYWlsLmNvbT4KRGF0ZTog RnJpLCAyNCBNYXIgMjAyMyAxMDowODoxMiArMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFJlc3RvcmUg cG9zaXRpb25zIGZvciBhYmJyZXZpYXRlZCBmaWxlIG5hbWVzIGluIHNhdmVwbGFjZS5lbAoKKiBs aXNwL3NhdmVwbGFjZS5lbCAoc2F2ZS1wbGFjZS1maW5kLWZpbGUtaG9vayk6IFVzZSBhYmJyZXZp YXRlZCBmaWxlCm5hbWUgd2hlbiBgc2F2ZS1wbGFjZS1hYmJyZXZpYXRlLWZpbGUtbmFtZXMnIGlz IG5vbi1uaWwuCi0tLQogbGlzcC9zYXZlcGxhY2UuZWwgfCA5ICsrKysrKysrLQogMSBmaWxlIGNo YW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2xpc3Av c2F2ZXBsYWNlLmVsIGIvbGlzcC9zYXZlcGxhY2UuZWwKaW5kZXggNzUxMmZjODdjNWQuLjZjM2Vk MzRmMTk4IDEwMDY0NAotLS0gYS9saXNwL3NhdmVwbGFjZS5lbAorKysgYi9saXNwL3NhdmVwbGFj ZS5lbApAQCAtMzUzLDcgKzM1MywxNCBAQCBzYXZlLXBsYWNlLWZpbmQtZmlsZS1ob29rCiAgICJG dW5jdGlvbiBhZGRlZCB0byBgZmluZC1maWxlLWhvb2snIGJ5IGBzYXZlLXBsYWNlLW1vZGUnLgog SXQgcnVucyB0aGUgaG9vayBgc2F2ZS1wbGFjZS1hZnRlci1maW5kLWZpbGUtaG9vaycuIgogICAo b3Igc2F2ZS1wbGFjZS1sb2FkZWQgKHNhdmUtcGxhY2UtbG9hZC1hbGlzdC1mcm9tLWZpbGUpKQot ICAobGV0ICgoY2VsbCAoYXNzb2MgYnVmZmVyLWZpbGUtbmFtZSBzYXZlLXBsYWNlLWFsaXN0KSkp CisgIChsZXQgKChjZWxsIChhbmQgKHN0cmluZ3AgYnVmZmVyLWZpbGUtbmFtZSkKKyAgICAgICAg ICAgICAgICAgICAoaWYgc2F2ZS1wbGFjZS1hYmJyZXZpYXRlLWZpbGUtbmFtZXMKKyAgICAgICAg ICAgICAgICAgICAgICAgKG9yIChhc3NvYyAoYWJicmV2aWF0ZS1maWxlLW5hbWUgYnVmZmVyLWZp bGUtbmFtZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzYXZlLXBsYWNlLWFs aXN0KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jIGJ1ZmZlci1maWxlLW5hbWUg c2F2ZS1wbGFjZS1hbGlzdCkpCisgICAgICAgICAgICAgICAgICAgICAob3IgKGFzc29jIGJ1ZmZl ci1maWxlLW5hbWUgc2F2ZS1wbGFjZS1hbGlzdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAo YXNzb2MgKGFiYnJldmlhdGUtZmlsZS1uYW1lIGJ1ZmZlci1maWxlLW5hbWUpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHNhdmUtcGxhY2UtYWxpc3QpKSkpKSkKICAgICAoaWYgY2Vs bAogCShwcm9nbgogCSAgKG9yIHJldmVydC1idWZmZXItaW4tcHJvZ3Jlc3MtcAotLSAKMi4yNS4x Cgo= --000000000000dbbd6105f7ba1fa2--