From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lin Sun Newsgroups: gmane.emacs.bugs Subject: bug#41646: Startup in Windows is very slow when load-path contains many Date: Mon, 21 Oct 2024 19:53:51 +0000 Message-ID: References: <86jzedy84g.fsf@gnu.org> <86r08luqsq.fsf@gnu.org> <86frp1unvu.fsf@gnu.org> <86y12stv24.fsf@gnu.org> <86set0th9d.fsf@gnu.org> <86iktwt49w.fsf@gnu.org> <86cyk4t2su.fsf@gnu.org> <86a5f8t0sf.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000be3e640625020367" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21538"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , acorallo@gnu.org, 41646@debbugs.gnu.org, stefankangas@gmail.com, monnier@gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Oct 21 21:56:10 2024 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 1t2yVd-0005Po-Gm for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 21 Oct 2024 21:56:09 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2yV8-0002Vk-Is; Mon, 21 Oct 2024 15:55:38 -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 1t2yV6-0002VD-Ha for bug-gnu-emacs@gnu.org; Mon, 21 Oct 2024 15:55:36 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t2yV6-0002Gh-1L for bug-gnu-emacs@gnu.org; Mon, 21 Oct 2024 15:55:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:In-Reply-To:References:MIME-Version:To:Subject; bh=9DCDShS2hTcaWnVGLDzFxljj0z2Rw4FvAe2u4KZ2uTU=; b=HDXWAxiGwhuS2XT4MORjft8i/6i4UQbzek+WoDLL6Qt3AnODdtha/yUXtGneUk5QB9rTxdON+DacxF5KKUt1GvmOLT1RNp0+kxIeJlvttl5gPNjSJVGRkpHnTORhdM78t2lYBYSot4v9djw8qG5aSpi7L4pV/TvcAGJrLfWfD//xXyxrrHR/9DvPsrpb4ZXDPwAv1E33KDQ32tpdw1fGeBkeh18Hos4cE0sgiYLACd19856eSONo9HvJYwbvHqjo7Os7GcSmooaPJoDeuzmZZxPHruGMwd+I710j7jINByWvL6+j2qIAXeHTdvpxGZeZFbrZB6xns0W1YNj4gmxajw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t2yVW-0002ym-JR for bug-gnu-emacs@gnu.org; Mon, 21 Oct 2024 15:56:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lin Sun Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 Oct 2024 19:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41646 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch fixed Original-Received: via spool by 41646-submit@debbugs.gnu.org id=B41646.172954054111420 (code B ref 41646); Mon, 21 Oct 2024 19:56:02 +0000 Original-Received: (at 41646) by debbugs.gnu.org; 21 Oct 2024 19:55:41 +0000 Original-Received: from localhost ([127.0.0.1]:53412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t2yVA-0002y7-IM for submit@debbugs.gnu.org; Mon, 21 Oct 2024 15:55:41 -0400 Original-Received: from mail-lj1-f177.google.com ([209.85.208.177]:44283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t2yV6-0002s6-Fw for 41646@debbugs.gnu.org; Mon, 21 Oct 2024 15:55:38 -0400 Original-Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2fb388e64b0so47662681fa.0 for <41646@debbugs.gnu.org>; Mon, 21 Oct 2024 12:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729540443; x=1730145243; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9DCDShS2hTcaWnVGLDzFxljj0z2Rw4FvAe2u4KZ2uTU=; b=eKx2jh0gJsiJ7ORyq1Csw4dWCBJ65egk/l5liIa1I1UmGzHqsRzBwtA6IgHg6Wws99 qI2wTiTWRwB702tIXpCzyhuvaCOU6anTN8vGTYSzobfg0bpGVuxMe82+EPHxUznK42Hc 3risLtoUGXan5vFK1Rg+wUPE6adgaOVdKYaE2Oo3PsDCVJxElnnHDwb+dwqlPfCbyHOL vtkAD02O8/W2S9XY9YOnlwbLyDQhrWlMcpaA/UfX+iSc2Pbn/xZo+UbUS1rgd7UAWG5Q hLR6wwyvb3VxCFTkmbjOKanBh7gvTrrKKB5x6rUog2Exd20MAbjoIMcusMhw6WdtuPXg lSyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729540443; x=1730145243; 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=9DCDShS2hTcaWnVGLDzFxljj0z2Rw4FvAe2u4KZ2uTU=; b=pB7go2VjCnRCcareZvtK5Nw/DSqawe+NfEGZ7OCeKtVa88KWi2oLiy5EUtT+5901Uu 02ugW6KL7nYPo8oMfI02sOSrS49V/PZHCSTSN2pXofmiEtHWOb4IP2aYJYacT17Z2yfn nhN79JF0k8GOJv0Nwkb1HdCoTuRsyrW9eeaJM+Ujday2wPBh3ieLNvOEp/2XKSWmsQS9 +EAmCDQTzkrqe+fOWRyNb2X9LwMv0lSXhANbmKJoDe6YcBaRkjG1LVeXmt1TCmRXoKu1 v1jJOci9pQtq0hO8fcLgDpwSw1hrU+7/pfbt6TWMMnO64jKC1vW1JMwJON6FSOVVVrSI 4tLA== X-Forwarded-Encrypted: i=1; AJvYcCXJkHL4cjNER36h7VDMTqUbCbX0X6pMgFCL1BlWl8tjcofxoU6oK2zUL+DnyDXC9dqSQaY17w==@debbugs.gnu.org X-Gm-Message-State: AOJu0YwUPDmSkypVy9/4vHFh3hKVB3IlkXW1fA2CV+FNubA6GmmVUXjT kFUblr/gCabkgIh/ecP5uvstn2yG2MQuEYXNuAOSWQFHWzSbdQoNCJNnLRLtY+2/22yeebkqyX+ NAVdYluCA6OfVv5IVUuYv6QGFsHc= X-Google-Smtp-Source: AGHT+IGBVgzPXINYGWR/dyN3yuMh/tQrbNXJGaYUwJX3LocRvpMn6cwwZZCdkTwUjnrN7+BXBISqOoJvx33/jTMUHMc= X-Received: by 2002:a2e:bc1d:0:b0:2fb:5a19:5b9b with SMTP id 38308e7fff4ca-2fc90441239mr8389261fa.8.1729540443172; Mon, 21 Oct 2024 12:54:03 -0700 (PDT) In-Reply-To: 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:294082 Archived-At: --000000000000be3e640625020367 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Oct 21, 2024 at 2:34=E2=80=AFPM Stefan Monnier wrote: > BTW, in your patch, you change `locate-file-internal` which seems wrong, > since that function is not specific to loading ELisp files, it's also > used for $MANPATH, $PATH, and things like that. You're right, the change in `locate-file-internal' didn't merge the original path. I attached the patch to append the `dirs' with `path' together. > Similarly, I wasn't able to convince myself that your patch does the > right thing when `require` or `load` is used such that MUST_SUFFIX is > not specified. The `load-hints` just put the matched paths on the top of `load-path`, still following the `load-path' mechanism, and won't affect any other features (Or someone already has some code to adjust the `load-path' orders, can just ignore the `load-hints', everything work like before, no break changes). --000000000000be3e640625020367 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-New-variable-load-hints-to-speedup-searching-file-fo.patch" Content-Disposition: attachment; filename="0001-New-variable-load-hints-to-speedup-searching-file-fo.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_m2jfpsoq1 RnJvbSA2NWM1NGU4ODJhMGFhYjI4ZmM1Njk3YTY0ZmQxZmRmMTVhMjY2NDQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaW4gU3VuIDxzdW5saW43QGhvdG1haWwuY29tPgpEYXRlOiBX ZWQsIDE2IE9jdCAyMDI0IDA3OjMxOjU5ICswMDAwClN1YmplY3Q6IFtQQVRDSCAxLzJdIE5ldyB2 YXJpYWJsZSBsb2FkLWhpbnRzIHRvIHNwZWVkdXAgc2VhcmNoaW5nIGZpbGUgZm9yCiAobG9hZCkg ZnVuY3Rpb24KCiogbGlzcC9zdWJyLmVsOiAobG9jYXRlLWxpYnJhcnkpIHN1cHBvcnQgdGhlIGBs b2FkLWhpbnRzJyB2YXJpYWJsZQoqIHNyYy9scmVhZC5jOiAobG9hZCkgZnVuY3Rpb24gc3VwcG9y dCB0aGUgYGxvYWQtaGludHMnIHZhcmlhYmxlCi0tLQogbGlzcC9zdWJyLmVsIHwgIDkgKystLS0K IHNyYy9scmVhZC5jICB8IDk5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgODYgaW5zZXJ0aW9ucygrKSwgMjIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9zdWJyLmVsIGIvbGlzcC9zdWJyLmVsCmluZGV4 IDJlYWVkNjgyNDA2Li4zZDk1OTkyNzBlZCAxMDA2NDQKLS0tIGEvbGlzcC9zdWJyLmVsCisrKyBi L2xpc3Avc3Vici5lbApAQCAtMzE0MSwxMCArMzE0MSwxMSBAQCBsb2NhdGUtbGlicmFyeQogc3Ry aW5nLiAgV2hlbiBydW4gaW50ZXJhY3RpdmVseSwgdGhlIGFyZ3VtZW50IElOVEVSQUNUSVZFLUNB TEwgaXMgdCwKIGFuZCB0aGUgZmlsZSBuYW1lIGlzIGRpc3BsYXllZCBpbiB0aGUgZWNobyBhcmVh LiIKICAgKGludGVyYWN0aXZlIChsaXN0IChyZWFkLWxpYnJhcnktbmFtZSkgbmlsIG5pbCB0KSkK LSAgKGxldCAoKGZpbGUgKGxvY2F0ZS1maWxlIGxpYnJhcnkKLQkJCSAgIChvciBwYXRoIGxvYWQt cGF0aCkKLQkJCSAgIChhcHBlbmQgKHVubGVzcyBub3N1ZmZpeCAoZ2V0LWxvYWQtc3VmZml4ZXMp KQotCQkJCSAgIGxvYWQtZmlsZS1yZXAtc3VmZml4ZXMpKSkpCisgIChsZXQgKChmaWxlIChsb2Nh dGUtZmlsZS1pbnRlcm5hbAorICAgICAgICAgICAgICAgbGlicmFyeSAob3IgcGF0aCBsb2FkLXBh dGgpCisgICAgICAgICAgICAgICAoYXBwZW5kICh1bmxlc3Mgbm9zdWZmaXggKGdldC1sb2FkLXN1 ZmZpeGVzKSkKKyAgICAgICAgICAgICAgICAgICAgICAgbG9hZC1maWxlLXJlcC1zdWZmaXhlcykK KyAgICAgICAgICAgICAgIG5pbCAodW5sZXNzIHBhdGggbG9hZC1oaW50cykpKSkKICAgICAoaWYg aW50ZXJhY3RpdmUtY2FsbAogCShpZiBmaWxlCiAJICAgIChtZXNzYWdlICJMaWJyYXJ5IGlzIGZp bGUgJXMiIChhYmJyZXZpYXRlLWZpbGUtbmFtZSBmaWxlKSkKZGlmZiAtLWdpdCBhL3NyYy9scmVh ZC5jIGIvc3JjL2xyZWFkLmMKaW5kZXggOTVjNjg5MWMyMDUuLjhkNTU4YWQ4YzY2IDEwMDY0NAot LS0gYS9zcmMvbHJlYWQuYworKysgYi9zcmMvbHJlYWQuYwpAQCAtMTI3MSw2ICsxMjcxLDUzIEBA IGNsb3NlX2ZpbGVfdW53aW5kX2FuZHJvaWRfZmQgKHZvaWQgKnB0cikKIAogI2VuZGlmCiAKK3N0 YXRpYyBib29sCitjb21wbGV0ZV9maWxlbmFtZV9wIChMaXNwX09iamVjdCBwYXRobmFtZSkKK3sK KyAgY29uc3QgdW5zaWduZWQgY2hhciAqcyA9IFNEQVRBIChwYXRobmFtZSk7CisgIHJldHVybiAo SVNfRElSRUNUT1JZX1NFUCAoc1swXSkKKwkgIHx8IChTQ0hBUlMgKHBhdGhuYW1lKSA+IDIgJiYg SVNfREVWSUNFX1NFUCAoc1sxXSkKKwkgICAgICAmJiBJU19ESVJFQ1RPUllfU0VQIChzWzJdKSkp OworfQorCisvKiBzZWFyY2ggdGhlIGZpbGUgaW4gbG9hZCBoaW50cyB0byBnZXQgYSBwYXRoIGxp c3QgKi8KK3N0YXRpYyBMaXNwX09iamVjdAorc2VhcmNoX2xvYWRfaGludHMoTGlzcF9PYmplY3Qg bG9hZF9oaW50cywgTGlzcF9PYmplY3QgZmlsZSkgeworICBMaXNwX09iamVjdCBsb2FkX3BhdGgg PSBRbmlsOworICBMaXNwX09iamVjdCB0YWlsID0gbG9hZF9oaW50czsKKyAgRk9SX0VBQ0hfVEFJ TF9TQUZFICh0YWlsKQorICAgIHsKKyAgICAgIGJvb2wgZnVsbG1hdGNoID0gZmFsc2U7CisgICAg ICBwdHJkaWZmX3QgbGVuID0gLTE7CisgICAgICBMaXNwX09iamVjdCByb3cgPSBYQ0FSICh0YWls KTsKKyAgICAgIExpc3BfT2JqZWN0IGtleSA9IFhDQVIgKHJvdyk7CisgICAgICBDSEVDS19TVFJJ TkcgKGtleSk7CisKKyAgICAgIGlmIChTQllURVMgKGtleSkgLSAxIDw9IFNCWVRFUyAoZmlsZSkp CisJeworCSAgaWYgKFNCWVRFUyAoa2V5KSA+PSAxCisJICAgICAgJiYgU0RBVEEgKGtleSlbU0JZ VEVTIChrZXkpIC0gMV0gPT0gJyonKQorCSAgICBsZW4gPSBTQllURVMgKGtleSkgLSAxOyAvKiAi ZmlsZS0qIiBmb3JtYXQgKi8KKwkgIGVsc2UgaWYgKFNCWVRFUyAoa2V5KSA9PSBTQllURVMgKGZp bGUpKQorCSAgICB7CisJICAgICAgbGVuID0gU0JZVEVTIChrZXkpOworCSAgICAgIGZ1bGxtYXRj aCA9IHRydWU7CisJICAgIH0KKwl9CisKKyAgICAgIGlmIChsZW4gPj0gMCAmJiAwID09IG1lbWNt cCAoU0RBVEEgKGtleSksIFNEQVRBIChmaWxlKSwgbGVuKSkKKwl7CisJICBpZiAoZnVsbG1hdGNo KQorCSAgICB7CisJICAgICAgbG9hZF9wYXRoID0gQ0FMTE4gKEZhcHBlbmQsIFhDRFIgKHJvdykp OworCSAgICAgIGJyZWFrOworCSAgICB9CisJICBsb2FkX3BhdGggPSBDQUxMTiAoRmFwcGVuZCwg bG9hZF9wYXRoLCBYQ0RSIChyb3cpKTsKKwl9CisgICAgfQorICByZXR1cm4gbG9hZF9wYXRoOwor fQorCiBERUZVTiAoImxvYWQiLCBGbG9hZCwgU2xvYWQsIDEsIDUsIDAsCiAgICAgICAgZG9jOiAv KiBFeGVjdXRlIGEgZmlsZSBvZiBMaXNwIGNvZGUgbmFtZWQgRklMRS4KIEZpcnN0IHRyeSBGSUxF IHdpdGggYC5lbGMnIGFwcGVuZGVkLCB0aGVuIHRyeSB3aXRoIGAuZWwnLCB0aGVuIHRyeQpAQCAt MTI3OCw3ICsxMzI1LDkgQEAgREVGVU4gKCJsb2FkIiwgRmxvYWQsIFNsb2FkLCAxLCA1LCAwLAog dGhlbiB0cnkgRklMRSB1bm1vZGlmaWVkICh0aGUgZXhhY3Qgc3VmZml4ZXMgaW4gdGhlIGV4YWN0 IG9yZGVyIGFyZQogZGV0ZXJtaW5lZCBieSBgbG9hZC1zdWZmaXhlcycpLiAgRW52aXJvbm1lbnQg dmFyaWFibGUgcmVmZXJlbmNlcyBpbgogRklMRSBhcmUgcmVwbGFjZWQgd2l0aCB0aGVpciB2YWx1 ZXMgYnkgY2FsbGluZyBgc3Vic3RpdHV0ZS1pbi1maWxlLW5hbWUnLgotVGhpcyBmdW5jdGlvbiBz ZWFyY2hlcyB0aGUgZGlyZWN0b3JpZXMgaW4gYGxvYWQtcGF0aCcuCitUaGlzIGZ1bmN0aW9uIHNl YXJjaGVzIHRoZSBlbnRyeSBpbiBgbG9hZC1oaW50c2AgZmlyc3QsIGlmIHNvbWUgZW50cmllcwor bWF0Y2hlZCwgc2VhcmNoZXMgaW4gdGhlIG1hdGNoZWQgcGF0aGVzLiBPdGhlcndpc2UsIHNlYXJj aGVzIGRpcmVjdG9yaWVzCitpbiBgbG9hZC1wYXRoJy4KIAogSWYgb3B0aW9uYWwgc2Vjb25kIGFy ZyBOT0VSUk9SIGlzIG5vbi1uaWwsCiByZXBvcnQgbm8gZXJyb3IgaWYgRklMRSBkb2Vzbid0IGV4 aXN0LgpAQCAtMTMyNyw3ICsxMzc2LDcgQEAgREVGVU4gKCJsb2FkIiwgRmxvYWQsIFNsb2FkLCAx LCA1LCAwLAogI2VuZGlmCiAgIHNwZWNwZGxfcmVmIGZkX2luZGV4IFVOSU5JVDsKICAgc3BlY3Bk bF9yZWYgY291bnQgPSBTUEVDUERMX0lOREVYICgpOwotICBMaXNwX09iamVjdCBmb3VuZCwgZWZv dW5kLCBoaXN0X2ZpbGVfbmFtZTsKKyAgTGlzcF9PYmplY3QgZm91bmQsIGVmb3VuZCwgaGlzdF9m aWxlX25hbWUsIGxvYWRfcGF0aCA9IFFuaWw7CiAgIC8qIFRydWUgbWVhbnMgd2UgcHJpbnRlZCB0 aGUgIi5lbCBpcyBuZXdlciIgbWVzc2FnZS4gICovCiAgIGJvb2wgbmV3ZXIgPSAwOwogICAvKiBU cnVlIG1lYW5zIHdlIGFyZSBsb2FkaW5nIGEgY29tcGlsZWQgZmlsZS4gICovCkBAIC0xNDA5LDEy ICsxNDU4LDIwIEBAIERFRlVOICgibG9hZCIsIEZsb2FkLCBTbG9hZCwgMSwgNSwgMCwKIAkgICAg c3VmZml4ZXMgPSBDQUxMTiAoRmFwcGVuZCwgc3VmZml4ZXMsIFZsb2FkX2ZpbGVfcmVwX3N1ZmZp eGVzKTsKIAl9CiAKKyAgICAgIGlmICghIChOSUxQIChWbG9hZF9oaW50cykgfHwgY29tcGxldGVf ZmlsZW5hbWVfcCAoZmlsZSkpKQorCWxvYWRfcGF0aCA9IHNlYXJjaF9sb2FkX2hpbnRzKFZsb2Fk X2hpbnRzLCBmaWxlKTsKKworICAgICAgaWYgKE5JTFAgKGxvYWRfcGF0aCkpCisJbG9hZF9wYXRo ID0gVmxvYWRfcGF0aDsKKyAgICAgIGVsc2UKKwlsb2FkX3BhdGggPSBDQUxMTiAoRmFwcGVuZCwg bG9hZF9wYXRoLCBWbG9hZF9wYXRoKTsKKwogI2lmICFkZWZpbmVkIFVTRV9BTkRST0lEX0FTU0VU UwotICAgICAgZmQgPSBvcGVucCAoVmxvYWRfcGF0aCwgZmlsZSwgc3VmZml4ZXMsICZmb3VuZCwg UW5pbCwKKyAgICAgIGZkID0gb3BlbnAgKGxvYWRfcGF0aCwgZmlsZSwgc3VmZml4ZXMsICZmb3Vu ZCwgUW5pbCwKIAkJICBsb2FkX3ByZWZlcl9uZXdlciwgbm9fbmF0aXZlLCBOVUxMKTsKICNlbHNl CiAgICAgICBhc3NldCA9IE5VTEw7Ci0gICAgICByYyA9IG9wZW5wIChWbG9hZF9wYXRoLCBmaWxl LCBzdWZmaXhlcywgJmZvdW5kLCBRbmlsLAorICAgICAgcmMgPSBvcGVucCAobG9hZF9wYXRoLCBm aWxlLCBzdWZmaXhlcywgJmZvdW5kLCBRbmlsLAogCQkgIGxvYWRfcHJlZmVyX25ld2VyLCBub19u YXRpdmUsICZhc3NldCk7CiAgICAgICBmZC5mZCA9IHJjOwogICAgICAgZmQuYXNzZXQgPSBhc3Nl dDsKQEAgLTE3ODAsMTYgKzE4MzcsNyBAQCBzYXZlX21hdGNoX2RhdGFfbG9hZCAoTGlzcF9PYmpl Y3QgZmlsZSwgTGlzcF9PYmplY3Qgbm9lcnJvciwKICAgcmV0dXJuIHVuYmluZF90byAoY291bnQs IHJlc3VsdCk7CiB9CiAMCi1zdGF0aWMgYm9vbAotY29tcGxldGVfZmlsZW5hbWVfcCAoTGlzcF9P YmplY3QgcGF0aG5hbWUpCi17Ci0gIGNvbnN0IHVuc2lnbmVkIGNoYXIgKnMgPSBTREFUQSAocGF0 aG5hbWUpOwotICByZXR1cm4gKElTX0RJUkVDVE9SWV9TRVAgKHNbMF0pCi0JICB8fCAoU0NIQVJT IChwYXRobmFtZSkgPiAyCi0JICAgICAgJiYgSVNfREVWSUNFX1NFUCAoc1sxXSkgJiYgSVNfRElS RUNUT1JZX1NFUCAoc1syXSkpKTsKLX0KLQotREVGVU4gKCJsb2NhdGUtZmlsZS1pbnRlcm5hbCIs IEZsb2NhdGVfZmlsZV9pbnRlcm5hbCwgU2xvY2F0ZV9maWxlX2ludGVybmFsLCAyLCA0LCAwLAor REVGVU4gKCJsb2NhdGUtZmlsZS1pbnRlcm5hbCIsIEZsb2NhdGVfZmlsZV9pbnRlcm5hbCwgU2xv Y2F0ZV9maWxlX2ludGVybmFsLCAyLCA1LCAwLAogICAgICAgIGRvYzogLyogU2VhcmNoIGZvciBG SUxFTkFNRSB0aHJvdWdoIFBBVEguCiBSZXR1cm5zIHRoZSBmaWxlJ3MgbmFtZSBpbiBhYnNvbHV0 ZSBmb3JtLCBvciBuaWwgaWYgbm90IGZvdW5kLgogSWYgU1VGRklYRVMgaXMgbm9uLW5pbCwgaXQg c2hvdWxkIGJlIGEgbGlzdCBvZiBzdWZmaXhlcyB0byBhcHBlbmQgdG8KQEAgLTE3OTcsMTIgKzE4 NDUsMjAgQEAgREVGVU4gKCJsb2NhdGUtZmlsZS1pbnRlcm5hbCIsIEZsb2NhdGVfZmlsZV9pbnRl cm5hbCwgU2xvY2F0ZV9maWxlX2ludGVybmFsLCAyLAogSWYgbm9uLW5pbCwgUFJFRElDQVRFIGlz IHVzZWQgaW5zdGVhZCBvZiBgZmlsZS1yZWFkYWJsZS1wJy4KIFBSRURJQ0FURSBjYW4gYWxzbyBi ZSBhbiBpbnRlZ2VyIHRvIHBhc3MgdG8gdGhlIGZhY2Nlc3NhdCgyKSBmdW5jdGlvbiwKIGluIHdo aWNoIGNhc2UgZmlsZS1uYW1lLWhhbmRsZXJzIGFyZSBpZ25vcmVkLgorTE9BRC1ISU5UUyBpcyBh IGxpc3Qgc2FtZSBhcyBgbG9hZC1oaW50cycuCiBUaGlzIGZ1bmN0aW9uIHdpbGwgbm9ybWFsbHkg c2tpcCBkaXJlY3Rvcmllcywgc28gaWYgeW91IHdhbnQgaXQgdG8gZmluZAogZGlyZWN0b3JpZXMs IG1ha2Ugc3VyZSB0aGUgUFJFRElDQVRFIGZ1bmN0aW9uIHJldHVybnMgYGRpci1vaycgZm9yIHRo ZW0uICAqLykKLSAgKExpc3BfT2JqZWN0IGZpbGVuYW1lLCBMaXNwX09iamVjdCBwYXRoLCBMaXNw X09iamVjdCBzdWZmaXhlcywgTGlzcF9PYmplY3QgcHJlZGljYXRlKQorICAoTGlzcF9PYmplY3Qg ZmlsZW5hbWUsIExpc3BfT2JqZWN0IHBhdGgsIExpc3BfT2JqZWN0IHN1ZmZpeGVzLCBMaXNwX09i amVjdCBwcmVkaWNhdGUsCisgICBMaXNwX09iamVjdCBsb2FkX2hpbnRzKQogewotICBMaXNwX09i amVjdCBmaWxlOwotICBpbnQgZmQgPSBvcGVucCAocGF0aCwgZmlsZW5hbWUsIHN1ZmZpeGVzLCAm ZmlsZSwgcHJlZGljYXRlLCBmYWxzZSwgdHJ1ZSwKKyAgTGlzcF9PYmplY3QgZmlsZSwgZGlycyA9 IFFuaWw7CisgIGlmICghTklMUChsb2FkX2hpbnRzKSkKKyAgICBkaXJzID0gc2VhcmNoX2xvYWRf aGludHMobG9hZF9oaW50cywgZmlsZW5hbWUpOworICBpZiAoTklMUChkaXJzKSkKKyAgICBkaXJz ID0gcGF0aDsKKyAgZWxzZQorICAgIGRpcnMgPSBDQUxMTiAoRmFwcGVuZCwgZGlycywgcGF0aCk7 CisgIGludCBmZCA9IG9wZW5wIChkaXJzLCBmaWxlbmFtZSwgc3VmZml4ZXMsICZmaWxlLCBwcmVk aWNhdGUsIGZhbHNlLCB0cnVlLAogCQkgIE5VTEwpOwogICBpZiAoTklMUCAocHJlZGljYXRlKSAm JiBmZCA+PSAwKQogICAgIGVtYWNzX2Nsb3NlIChmZCk7CkBAIC0xODgyLDcgKzE5MzgsNyBAQCBt YXliZV9zd2FwX2Zvcl9lbG4gKGJvb2wgbm9fbmF0aXZlLCBMaXNwX09iamVjdCAqZmlsZW5hbWUs IGludCAqZmQsCiAJCSBjYW4ndCBmaW5kIGV2ZW4gY2VudHJhbCAuZWwgZmlsZXMuICAqLwogCSAg ICAgIGlmIChOSUxQIChGbG9jYXRlX2ZpbGVfaW50ZXJuYWwgKGJ1aWxkX3N0cmluZyAoInNpbXBs ZS5lbCIpLAogCQkJCQkgICAgICAgVmxvYWRfcGF0aCwKLQkJCQkJICAgICAgIFFuaWwsIFFuaWwp KSkKKwkJCQkJICAgICAgIFFuaWwsIFFuaWwsIFFuaWwpKSkKIAkJcmV0dXJuOwogCSAgICAgIFZk ZWxheWVkX3dhcm5pbmdzX2xpc3QKIAkJPSBGY29ucyAobGlzdDIKQEAgLTU4NTEsNiArNTkwNywx MyBAQCBzeW1zX29mX2xyZWFkICh2b2lkKQogCSAgICAgICBkb2M6IC8qIE5vbi1uaWwgbWVhbnMg cmVhZCByZWN1cnNpdmUgc3RydWN0dXJlcyB1c2luZyAjTj0gYW5kICNOIyBzeW50YXguICAqLyk7 CiAgIFZyZWFkX2NpcmNsZSA9IFF0OwogCisgIERFRlZBUl9MSVNQICgibG9hZC1oaW50cyIsIFZs b2FkX2hpbnRzLAorCSAgICAgICBkb2M6IC8qIEEgbGlzdCBmb3IgbmFtZSB0byBkaXJlY3Rvcnkt bGlzdCB0byBzZWFyY2ggZm9yIGZpbGVzCit0byBsb2FkLCBiZWZvcmUgdGhlIGxvYWQtcGF0aC4g IEVhY2hlIGVudHJ5IGlzIGEgZmlsZSBuYW1lIHRvIGRpcmVjdG9yeSBsaXN0LAorZmlsZSBuYW1l IGVuZHMgd2l0aCBhICcqJyBtZWFucyBwcmVmaXggbWF0Y2hpbmcuIEV4YW1wbGU6CisgICcoKCJu YW1lMS0qIiAiL3BhdGgxIiAiL3BhdGgyIikpLiAgKi8pOworICBWbG9hZF9oaW50cyA9IFFuaWw7 CisKICAgREVGVkFSX0xJU1AgKCJsb2FkLXBhdGgiLCBWbG9hZF9wYXRoLAogCSAgICAgICBkb2M6 IC8qIExpc3Qgb2YgZGlyZWN0b3JpZXMgdG8gc2VhcmNoIGZvciBmaWxlcyB0byBsb2FkLgogRWFj aCBlbGVtZW50IGlzIGEgc3RyaW5nIChkaXJlY3RvcnkgZmlsZSBuYW1lKSBvciBuaWwgKG1lYW5p bmcKLS0gCjIuMzQuMQoK --000000000000be3e640625020367 Content-Type: text/x-patch; charset="US-ASCII"; name="0002-lisp-emacs-lisp-package.el-Support-the-load-hints.patch" Content-Disposition: attachment; filename="0002-lisp-emacs-lisp-package.el-Support-the-load-hints.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_m2jfpsog0 RnJvbSA0ZWZiM2I2ODllZjZmOTdjYWI4MmU1YjM0Y2Y5ZGFiYzNmM2Q3ZWUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaW4gU3VuIDxzdW5saW43QGhvdG1haWwuY29tPgpEYXRlOiBT YXQsIDE5IE9jdCAyMDI0IDA2OjQzOjE1ICswMDAwClN1YmplY3Q6IFtQQVRDSCAyLzJdICogbGlz cC9lbWFjcy1saXNwL3BhY2thZ2UuZWw6IFN1cHBvcnQgdGhlIGxvYWQtaGludHMKCi0tLQogbGlz cC9lbWFjcy1saXNwL3BhY2thZ2UuZWwgfCA3OSArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDY2IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLmVsIGIvbGlzcC9lbWFj cy1saXNwL3BhY2thZ2UuZWwKaW5kZXggOTBkNjE1MGVkMGIuLjFjNGQ0N2I3MWYyIDEwMDY0NAot LS0gYS9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS5lbAorKysgYi9saXNwL2VtYWNzLWxpc3AvcGFj a2FnZS5lbApAQCAtMjA4LDYgKzIwOCwyMiBAQCBwYWNrYWdlLWxvYWQtbGlzdAogICA6cmlza3kg dAogICA6dmVyc2lvbiAiMjQuMSIpCiAKKyhkZWZjdXN0b20gcGFja2FnZS1lbmFibGUtbG9hZC1o aW50cyB0CisgICJOb24tbmlsIG1lYW5zIGVuYWJsZSB0aGUgYGxvYWQtaGludHMnIGZvciB0aGUg cGFja2FnZXMuCisKK1RoZSB2YWx1ZSBjYW4gYmUgb25lIG9mOgorCisgIHQgICAgICAgICAgICAg QWRkIHBhY2thZ2UgZGlyIGludG8gYm90aCBgbG9hZC1oaW50cycgYW5kIGBsb2FkLXBhdGgnLgor CisgIGBhZ2dyZXNzaXZlJyAgSWYgYWxsIGZpbGVzIGluIGEgcGFja2FnZSBkaXIgd2VyZSBjb3Zl cmVkIGJ5IHRoZSBgbG9hZC1oaW50cycKKyAgICAgICAgICAgICAgICB0aGVuIHdpbGwgbm90IGFk ZCB0aGUgcGFja2FnZSBkaXIgaW50byBgbG9hZC1wYXRoJy4KKworICBuaWwgICAgICAgICAgIERv bid0IHVzZWQgdGhlIGBsb2FkLWhpbnRzJy4iCisgIDp0eXBlICcoY2hvaWNlIChjb25zdCA6dmFs dWUgbmlsICAgICAgICAgICAgOnRhZyAiRGlzYWJsZSIpCisgICAgICAgICAgICAgICAgIChjb25z dCA6dmFsdWUgdCAgICAgICAgICAgICAgOnRhZyAiRW5hYmxlKHNhZmUpIikKKyAgICAgICAgICAg ICAgICAgKGNvbnN0IDp2YWx1ZSBhZ2dyZXNzaXZlICAgICA6dGFnICJFbmFibGUoYWdyZXNzaXZl KSIpKQorICA6dmVyc2lvbiAiMzEuMSIpCisKIChkZWZjdXN0b20gcGFja2FnZS1hcmNoaXZlcyBg KCgiZ251IiAuCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLChmb3JtYXQgImh0dHAl czovL2VscGEuZ251Lm9yZy9wYWNrYWdlcy8iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKGlmIChnbnV0bHMtYXZhaWxhYmxlLXApICJzIiAiIikpKQpAQCAtMTA5NSwy MSArMTExMSw1OCBAQCBwYWNrYWdlLWdlbmVyYXRlLWF1dG9sb2FkcwogICAgICAgICAgOzsgV2Ug ZG9uJ3QgbmVlZCAnZW0sIGFuZCB0aGlzIG1ha2VzIHRoZSBvdXRwdXQgcmVwcm9kdWNpYmxlLgog ICAgICAgICAgKGF1dG9sb2FkLXRpbWVzdGFtcHMgbmlsKQogICAgICAgICAgKGJhY2t1cC1pbmhp Yml0ZWQgdCkKLSAgICAgICAgICh2ZXJzaW9uLWNvbnRyb2wgJ25ldmVyKSkKKyAgICAgICAgICh2 ZXJzaW9uLWNvbnRyb2wgJ25ldmVyKQorICAgICAgICAgaGludHMtbGlzdCBoaW50cy1jb3ZlcmVk LWFsbCkKKyAgICA7OyBpZiBwYWNrYWdlLWVuYWJsZWQtbG9hZC1oaW50cyBpcyBub24tbmlsIHRo ZW4gY29sbGVjdGluZyBsb2FkYWJsZQorICAgIDs7IGZpbGVzIGluIHBrZy1kaXIgYW5kIGdlbmVy YXRpbmcgdGhlIGxvYWQtaGludHMgbGlzdC4KKyAgICAod2hlbi1sZXQqIChwYWNrYWdlLWVuYWJs ZS1sb2FkLWhpbnRzCisgICAgICAgICAgICAgICAgKG5hbWUgKHN5bWJvbC1uYW1lIG5hbWUpKQor ICAgICAgICAgICAgICAgIChmaWxlcyAoY2wtc2V0LWRpZmZlcmVuY2UgKGRpcmVjdG9yeS1maWxl cyBwa2ctZGlyKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJygi LiIgIi4uIikgOnRlc3QgIydzdHJpbmc9KSkKKyAgICAgICAgICAgICAgICA7OyBsaXN0IG9mIGZp bGVzIGJhc2VuYW1lLCB0aGUgbG9hZC1zdWZmaXhlcyB3YXMgcmVtb3ZlZAorICAgICAgICAgICAg ICAgIChiYXNlcworICAgICAgICAgICAgICAgICAocmVtb3ZlIG5pbAorICAgICAgICAgICAgICAg ICAgICAgICAgIChtYXBjYXIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKGxhbWJkYSAoZikK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2wtc29tZQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAobGFtYmRhIChzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChp Zi1sZXQqICgobiAobGVuZ3RoIHMpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAoKGxlbmd0aD4gZiBuKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKChzdHJpbmc9IHMgKHN1YnN0cmluZyBmICgtIG4pKSkpKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoc3Vic3RyaW5nIGYgMCAoLSBuKSkpKQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAoZ2V0LWxvYWQtc3VmZml4ZXMpKSkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgZmlsZXMpKSkpCisgICAgICAoc2V0cSBoaW50cy1jb3ZlcmVkLWFsbCAobGVu Z3RoPSBiYXNlcyAobGVuZ3RoIGZpbGVzKSkKKyAgICAgICAgICAgIGhpbnRzLWxpc3QKKyAgICAg ICAgICAgIChjbC1yZW1vdmUtZHVwbGljYXRlcworICAgICAgICAgICAgIChtYXBjYXIgKGxhbWJk YSAocykKKyAgICAgICAgICAgICAgICAgICAgICAgKGZvcm1hdCAiKGFkZC10by1saXN0ICdsb2Fk LWhpbnRzICcoJVMgJVMpKSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaWYgKHN0 cmluZy1wcmVmaXgtcCBuYW1lIHMpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChjb25jYXQgbmFtZSAiKiIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBrZy1kaXIpKQorICAgICAgICAgICAgICAg ICAgICAgYmFzZXMpCisgICAgICAgICAgICAgOnRlc3QgJ3N0cmluZz0pKSkKICAgICAobG9hZGRl ZnMtZ2VuZXJhdGUKICAgICAgcGtnLWRpciBvdXRwdXQtZmlsZSBuaWwKLSAgICAgKHByaW4xLXRv LXN0cmluZwotICAgICAgJyhhZGQtdG8tbGlzdAotICAgICAgICAnbG9hZC1wYXRoCi0gICAgICAg IDs7IEFkZCB0aGUgZGlyZWN0b3J5IHRoYXQgd2lsbCBjb250YWluIHRoZSBhdXRvbG9hZCBmaWxl IHRvCi0gICAgICAgIDs7IHRoZSBsb2FkIHBhdGguICBXZSBkb24ndCBoYXJkLWNvZGUgYHBrZy1k aXInLCB0byBhdm9pZAotICAgICAgICA7OyBpc3N1ZXMgaWYgdGhlIHBhY2thZ2UgZGlyZWN0b3J5 IGlzIG1vdmVkIGFyb3VuZC4KLSAgICAgICAgOzsgYGxvYWRkZWZzLWdlbmVyYXRlJyBoYXMgY29k ZSB0byBkbyB0aGlzIGZvciB1cywgYnV0IGl0J3MKLSAgICAgICAgOzsgbm90IGN1cnJlbnRseSBl eHBvc2VkLiAgKEJ1ZyM2MzYyNSkKLSAgICAgICAgKG9yIChhbmQgbG9hZC1maWxlLW5hbWUKLSAg ICAgICAgICAgICAgICAgKGRpcmVjdG9yeS1maWxlLW5hbWUKLSAgICAgICAgICAgICAgICAgIChm aWxlLW5hbWUtZGlyZWN0b3J5IGxvYWQtZmlsZS1uYW1lKSkpCi0gICAgICAgICAgICAgKGNhciBs b2FkLXBhdGgpKSkpKQorICAgICAoY29uY2F0CisgICAgICAod2hlbiBoaW50cy1saXN0CisgICAg ICAgIChzdHJpbmctam9pbiBoaW50cy1saXN0ICJcbiIpKQorICAgICAgIlxuIgorICAgICAgKHVu bGVzcyAoYW5kIGhpbnRzLWNvdmVyZWQtYWxsCisgICAgICAgICAgICAgICAgICAgKGVxIHBhY2th Z2UtZW5hYmxlLWxvYWQtaGludHMgJ2FnZ3Jlc3NpdmUpKQorICAgICAgICAocHJpbjEtdG8tc3Ry aW5nCisgICAgICAgICAnKGFkZC10by1saXN0CisgICAgICAgICAgICdsb2FkLXBhdGgKKyAgICAg ICAgICAgOzsgQWRkIHRoZSBkaXJlY3RvcnkgdGhhdCB3aWxsIGNvbnRhaW4gdGhlIGF1dG9sb2Fk IGZpbGUgdG8KKyAgICAgICAgICAgOzsgdGhlIGxvYWQgcGF0aC4gIFdlIGRvbid0IGhhcmQtY29k ZSBgcGtnLWRpcicsIHRvIGF2b2lkCisgICAgICAgICAgIDs7IGlzc3VlcyBpZiB0aGUgcGFja2Fn ZSBkaXJlY3RvcnkgaXMgbW92ZWQgYXJvdW5kLgorICAgICAgICAgICA7OyBgbG9hZGRlZnMtZ2Vu ZXJhdGUnIGhhcyBjb2RlIHRvIGRvIHRoaXMgZm9yIHVzLCBidXQgaXQncworICAgICAgICAgICA7 OyBub3QgY3VycmVudGx5IGV4cG9zZWQuICAoQnVnIzYzNjI1KQorICAgICAgICAgICAob3IgKGFu ZCBsb2FkLWZpbGUtbmFtZQorICAgICAgICAgICAgICAgICAgICAoZGlyZWN0b3J5LWZpbGUtbmFt ZQorICAgICAgICAgICAgICAgICAgICAgKGZpbGUtbmFtZS1kaXJlY3RvcnkgbG9hZC1maWxlLW5h bWUpKSkKKyAgICAgICAgICAgICAgIChjYXIgbG9hZC1wYXRoKSkpKSkpKQogICAgIChsZXQgKChi dWYgKGZpbmQtYnVmZmVyLXZpc2l0aW5nIG91dHB1dC1maWxlKSkpCiAgICAgICAod2hlbiBidWYg KGtpbGwtYnVmZmVyIGJ1ZikpKQogICAgIGF1dG8tbmFtZSkpCi0tIAoyLjM0LjEKCg== --000000000000be3e640625020367--