From mboxrd@z Thu Jan 1 00:00:00 1970 From: Allen Li Subject: Re: Bug: org-agenda-overriding-columns-format destroyed on revert [9.2.1 (9.2.1-2-gc6d37c-elpaplus)] Date: Mon, 25 Feb 2019 08:01:39 +0000 Message-ID: References: <808syk5cis.fsf@felesatra.moe> <87r2c4sspm.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00000000000062fd940582b35af0" Return-path: Received: from eggs.gnu.org ([209.51.188.92]:60363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyBDD-0001hS-L6 for emacs-orgmode@gnu.org; Mon, 25 Feb 2019 03:02:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyBD7-00008z-FW for emacs-orgmode@gnu.org; Mon, 25 Feb 2019 03:02:07 -0500 Received: from mail-it1-x12e.google.com ([2607:f8b0:4864:20::12e]:37785) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gyBD3-0008K3-P0 for emacs-orgmode@gnu.org; Mon, 25 Feb 2019 03:02:00 -0500 Received: by mail-it1-x12e.google.com with SMTP id z124so11971323itc.2 for ; Mon, 25 Feb 2019 00:01:51 -0800 (PST) In-Reply-To: <87r2c4sspm.fsf@nicolasgoaziou.fr> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Allen Li , Org Mode List --00000000000062fd940582b35af0 Content-Type: text/plain; charset="UTF-8" Thank you for the comments, attached new patch. On Mon, Feb 18, 2019 at 9:16 PM Nicolas Goaziou wrote: > > > (defun org-agenda-finalize () > > "Finishing touch for the agenda buffer, called just before displaying it." > > (unless org-agenda-multi > > @@ -3783,7 +3784,7 @@ FILTER-ALIST is an alist of filters we need to apply when > > (unless org-agenda-with-colors > > (remove-text-properties (point-min) (point-max) '(face nil))) > > (when (bound-and-true-p org-agenda-overriding-columns-format) > > - (setq-local org-agenda-overriding-columns-format > > + (setq-local org-agenda-local-overriding-columns-format > > Since this is a local variable, `setq' is enough, isn't it? I don't know if the defvar-local in org-colview will be loaded before this point, so I think it's safer to just use setq-local. > > (defvar org-agenda-overriding-columns-format nil > > "When set, overrides any other format definition for the agenda. > > -Don't set this, this is meant for dynamic scoping.") > > +Don't set this, this is meant for dynamic scoping. Set > > +`org-agenda-local-overriding-columns-format' instead.") > > The first line of a docstring cannot contain an incomplete sentence (due > to `apropos` design). I think you misread? I didn't touch the first line. > > > +(defvar-local org-agenda-local-overriding-columns-format nil > > + "When set, overrides any other format definition for the agenda. > > +This can be set as a buffer local value to avoid interfering with > > +dynamic scoping for `org-agenda-overriding-columns-format'.") > > The two variable names are somewhat confusing. Could > `org-agenda-local-overriding-columns-format' be renamed into > `org-local-columns-format'? Since it is defined in "org-colview.el", it > doesn't deserve the "org-agenda" prefix (and neither does the original > `org-agenda-overriding-columns-format'.). > > Regards, > > -- > Nicolas Goaziou --00000000000062fd940582b35af0 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Fix-buffer-local-org-agenda-overriding-columns-forma.patch" Content-Disposition: attachment; filename="0001-Fix-buffer-local-org-agenda-overriding-columns-forma.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jsk1w0ng0 RnJvbSBhODgxNDk2MmU3M2FmNjFlYmJiZGViMjBlY2ViNTNlMDlkMDMwYjA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGxlbiBMaSA8ZGFya2ZlbGluZUBmZWxlc2F0cmEubW9lPgpE YXRlOiBTYXQsIDE2IEZlYiAyMDE5IDE3OjIxOjA0IC0wODAwClN1YmplY3Q6IFtQQVRDSF0gRml4 IGJ1ZmZlciBsb2NhbCBvcmctYWdlbmRhLW92ZXJyaWRpbmctY29sdW1ucy1mb3JtYXQgYnVnCgpT ZXR0aW5nIG9yZy1hZ2VuZGEtb3ZlcnJpZGluZy1jb2x1bW5zLWZvcm1hdCBhcyBhIGJ1ZmZlciBs b2NhbCB2YWx1ZQppbnRlcmZlcmVzIHdpdGggaG93IGl0IGlzIHVzZWQgYXMgYSBkeW5hbWljYWxs eSBzY29wZWQgdmFyLCBzbyB1c2UgYQpzZXBhcmF0ZSB2YXJpYWJsZSBmb3IgYnVmZmVyIGxvY2Fs IHNldHRpbmcuCgoqIGRvYy9vcmctbWFudWFsLm9yZyAoVXNpbmcgQ29sdW1uIFZpZXcgaW4gdGhl IEFnZW5kYSk6IFVwZGF0ZWQKICByZWZlcmVuY2UgdG8gdmFyaWFibGUuCiogbGlzcC9vcmctYWdl bmRhLmVsIChvcmctYWdlbmRhLWZpbmFsaXplKTogU2V0IGJ1ZmZlciBsb2NhbCB2YXJpYWJsZQog IGluc3RlYWQuCiogbGlzcC9vcmctY29sdmlldy5lbCAob3JnLW92ZXJyaWRpbmctY29sdW1ucy1m b3JtYXQpOiBSZW5hbWVkLgoob3JnLWFnZW5kYS1vdmVycmlkaW5nLWNvbHVtbnMtZm9ybWF0KTog UmVuYW1lZC4KKG9yZy1sb2NhbC1jb2x1bW5zLWZvcm1hdCk6IE5ldyBidWZmZXIgbG9jYWwgdmFy aWFibGUuCihvcmctY29sdW1ucy1lZGl0LXZhbHVlKTogVXBkYXRlZCByZWZlcmVuY2UgdG8gdmFy aWFibGUuCihvcmctY29sdW1ucy1uZXh0LWFsbG93ZWQtdmFsdWUpOiBVcGRhdGVkIHJlZmVyZW5j ZSB0byB2YXJpYWJsZS4KKG9yZy1hZ2VuZGEtY29sdW1ucyk6IFVwZGF0ZWQgcmVmZXJlbmNlIHRv IHZhcmlhYmxlLgotLS0KIGRvYy9vcmctbWFudWFsLm9yZyAgfCAgMiArLQogbGlzcC9vcmctYWdl bmRhLmVsICB8ICA5ICsrKysrLS0tLQogbGlzcC9vcmctY29sdmlldy5lbCB8IDIwICsrKysrKysr KysrKysrKy0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDEwIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9vcmctbWFudWFsLm9yZyBiL2RvYy9vcmctbWFudWFs Lm9yZwppbmRleCBhMWNjMzU2MDguLmE4YzUyNjgxYiAxMDA2NDQKLS0tIGEvZG9jL29yZy1tYW51 YWwub3JnCisrKyBiL2RvYy9vcmctbWFudWFsLm9yZwpAQCAtMTA0NzcsNyArMTA0NzcsNyBAQCBl bnZpcm9ubWVudC4gIFRoaXMgY2F1c2VzIHRoZSBmb2xsb3dpbmcgaXNzdWVzOgogICAgdGhlIGVu dHJpZXMgaW4gdGhlIGFnZW5kYSBhcmUgY29sbGVjdGVkIGZyb20gZGlmZmVyZW50IGZpbGVzLCBh bmQKICAgIGRpZmZlcmVudCBmaWxlcyBtYXkgaGF2ZSBkaWZmZXJlbnQgY29sdW1ucyBmb3JtYXRz LCB0aGlzIGlzCiAgICBhIG5vbi10cml2aWFsIHByb2JsZW0uICBPcmcgZmlyc3QgY2hlY2tzIGlm IHRoZSB2YXJpYWJsZQotICAgfm9yZy1hZ2VuZGEtb3ZlcnJpZGluZy1jb2x1bW5zLWZvcm1hdH4g aXMgY3VycmVudGx5IHNldCwgYW5kIGlmIHNvLAorICAgfm9yZy1vdmVycmlkaW5nLWNvbHVtbnMt Zm9ybWF0fiBpcyBjdXJyZW50bHkgc2V0LCBhbmQgaWYgc28sCiAgICB0YWtlcyB0aGUgZm9ybWF0 IGZyb20gdGhlcmUuICBPdGhlcndpc2UgaXQgdGFrZXMgdGhlIGZvcm1hdAogICAgYXNzb2NpYXRl ZCB3aXRoIHRoZSBmaXJzdCBpdGVtIGluIHRoZSBhZ2VuZGEsIG9yLCBpZiB0aGF0IGl0ZW0gZG9l cwogICAgbm90IGhhdmUgYSBzcGVjaWZpYyBmb3JtYXQgKGRlZmluZWQgaW4gYSBwcm9wZXJ0eSwg b3IgaW4gaXRzIGZpbGUpLApkaWZmIC0tZ2l0IGEvbGlzcC9vcmctYWdlbmRhLmVsIGIvbGlzcC9v cmctYWdlbmRhLmVsCmluZGV4IGMxYThhNDRmMi4uNGEwNjA0YTliIDEwMDY0NAotLS0gYS9saXNw L29yZy1hZ2VuZGEuZWwKKysrIGIvbGlzcC9vcmctYWdlbmRhLmVsCkBAIC0zNzY2LDcgKzM3NjYs OCBAQCBGSUxURVItQUxJU1QgaXMgYW4gYWxpc3Qgb2YgZmlsdGVycyB3ZSBuZWVkIHRvIGFwcGx5 IHdoZW4KIAkgICAgIChzZXRxLWxvY2FsIG9yZy1hZ2VuZGEtbmFtZSBuYW1lKSkpCiAgICAgICAo c2V0cSBidWZmZXItcmVhZC1vbmx5IG5pbCkpKSkKIAotKGRlZnZhciBvcmctYWdlbmRhLW92ZXJy aWRpbmctY29sdW1ucy1mb3JtYXQpICA7IEZyb20gb3JnLWNvbHZpZXcuZWwKKyhkZWZ2YXIgb3Jn LW92ZXJyaWRpbmctY29sdW1ucy1mb3JtYXQpCisoZGVmdmFyIG9yZy1sb2NhbC1jb2x1bW5zLWZv cm1hdCkKIChkZWZ1biBvcmctYWdlbmRhLWZpbmFsaXplICgpCiAgICJGaW5pc2hpbmcgdG91Y2gg Zm9yIHRoZSBhZ2VuZGEgYnVmZmVyLCBjYWxsZWQganVzdCBiZWZvcmUgZGlzcGxheWluZyBpdC4i CiAgICh1bmxlc3Mgb3JnLWFnZW5kYS1tdWx0aQpAQCAtMzc4MSw5ICszNzgyLDkgQEAgRklMVEVS LUFMSVNUIGlzIGFuIGFsaXN0IG9mIGZpbHRlcnMgd2UgbmVlZCB0byBhcHBseSB3aGVuCiAJICAo b3JnLWFnZW5kYS1hbGlnbi10YWdzKSkKIAkodW5sZXNzIG9yZy1hZ2VuZGEtd2l0aC1jb2xvcnMK IAkgIChyZW1vdmUtdGV4dC1wcm9wZXJ0aWVzIChwb2ludC1taW4pIChwb2ludC1tYXgpICcoZmFj ZSBuaWwpKSkKLQkod2hlbiAoYm91bmQtYW5kLXRydWUtcCBvcmctYWdlbmRhLW92ZXJyaWRpbmct Y29sdW1ucy1mb3JtYXQpCi0JICAoc2V0cS1sb2NhbCBvcmctYWdlbmRhLW92ZXJyaWRpbmctY29s dW1ucy1mb3JtYXQKLQkJICAgICAgb3JnLWFnZW5kYS1vdmVycmlkaW5nLWNvbHVtbnMtZm9ybWF0 KSkKKwkod2hlbiAoYm91bmQtYW5kLXRydWUtcCBvcmctb3ZlcnJpZGluZy1jb2x1bW5zLWZvcm1h dCkKKwkgIChzZXRxLWxvY2FsIG9yZy1sb2NhbC1jb2x1bW5zLWZvcm1hdAorCQkgICAgICBvcmct b3ZlcnJpZGluZy1jb2x1bW5zLWZvcm1hdCkpCiAJKHdoZW4gb3JnLWFnZW5kYS12aWV3LWNvbHVt bnMtaW5pdGlhbGx5CiAJICAob3JnLWFnZW5kYS1jb2x1bW5zKSkKIAkod2hlbiBvcmctYWdlbmRh LWZvbnRpZnktcHJpb3JpdGllcwpkaWZmIC0tZ2l0IGEvbGlzcC9vcmctY29sdmlldy5lbCBiL2xp c3Avb3JnLWNvbHZpZXcuZWwKaW5kZXggNzQ2NDI2YmM3Li5hN2E0NDE2NDkgMTAwNjQ0Ci0tLSBh L2xpc3Avb3JnLWNvbHZpZXcuZWwKKysrIGIvbGlzcC9vcmctY29sdmlldy5lbApAQCAtNTY1LDkg KzU2NSwxOCBAQCBmb3IgdGhlIGR1cmF0aW9uIG9mIHRoZSBjb21tYW5kLiIpCiAgICAgICAob3Jn LWNvbHVtbnMtbmV4dC1hbGxvd2VkLXZhbHVlKQogICAgIChvcmctY29sdW1ucy1lZGl0LXZhbHVl ICJUQUdTIikpKQogCi0oZGVmdmFyIG9yZy1hZ2VuZGEtb3ZlcnJpZGluZy1jb2x1bW5zLWZvcm1h dCBuaWwKKyhkZWZpbmUtb2Jzb2xldGUtdmFyaWFibGUtYWxpYXMgJ29yZy1hZ2VuZGEtb3ZlcnJp ZGluZy1jb2x1bW5zLWZvcm1hdAorICAnb3JnLW92ZXJyaWRpbmctY29sdW1ucy1mb3JtYXQgIk9y ZyA5LjIuMiIpCisKKyhkZWZ2YXIgb3JnLW92ZXJyaWRpbmctY29sdW1ucy1mb3JtYXQgbmlsCisg ICJXaGVuIHNldCwgb3ZlcnJpZGVzIGFueSBvdGhlciBmb3JtYXQgZGVmaW5pdGlvbiBmb3IgdGhl IGFnZW5kYS4KK0Rvbid0IHNldCB0aGlzLCB0aGlzIGlzIG1lYW50IGZvciBkeW5hbWljIHNjb3Bp bmcuICBTZXQKK2BvcmctbG9jYWwtY29sdW1ucy1mb3JtYXQnIGluc3RlYWQuIikKKworKGRlZnZh ci1sb2NhbCBvcmctbG9jYWwtY29sdW1ucy1mb3JtYXQgbmlsCiAgICJXaGVuIHNldCwgb3ZlcnJp ZGVzIGFueSBvdGhlciBmb3JtYXQgZGVmaW5pdGlvbiBmb3IgdGhlIGFnZW5kYS4KLURvbid0IHNl dCB0aGlzLCB0aGlzIGlzIG1lYW50IGZvciBkeW5hbWljIHNjb3BpbmcuIikKK1RoaXMgY2FuIGJl IHNldCBhcyBhIGJ1ZmZlciBsb2NhbCB2YWx1ZSB0byBhdm9pZCBpbnRlcmZlcmluZyB3aXRoCitk eW5hbWljIHNjb3BpbmcgZm9yIGBvcmctb3ZlcnJpZGluZy1jb2x1bW5zLWZvcm1hdCcuIikKIAog KGRlZnVuIG9yZy1jb2x1bW5zLWVkaXQtdmFsdWUgKCZvcHRpb25hbCBrZXkpCiAgICJFZGl0IHRo ZSB2YWx1ZSBvZiB0aGUgcHJvcGVydHkgYXQgcG9pbnQgaW4gY29sdW1uIHZpZXcuCkBAIC02Mjgs NyArNjM3LDcgQEAgV2hlcmUgcG9zc2libGUsIHVzZSB0aGUgc3RhbmRhcmQgaW50ZXJmYWNlIGZv ciBjaGFuZ2luZyB0aGlzIGxpbmUuIgogICAgICAgKG9yZy1jb2x1bW5zLS1jYWxsIGFjdGlvbikK ICAgICAgIDs7IFRoZSBmb2xsb3dpbmcgbGV0IHByZXNlcnZlcyB0aGUgY3VycmVudCBmb3JtYXQs IGFuZCBtYWtlcwogICAgICAgOzsgc3VyZSB0aGF0IGluIG9ubHkgYSBzaW5nbGUgZmlsZSB0aGlu Z3MgbmVlZCB0byBiZSB1cGRhdGVkLgotICAgICAgKGxldCogKChvcmctYWdlbmRhLW92ZXJyaWRp bmctY29sdW1ucy1mb3JtYXQgb3JnLWNvbHVtbnMtY3VycmVudC1mbXQpCisgICAgICAobGV0KiAo KG9yZy1vdmVycmlkaW5nLWNvbHVtbnMtZm9ybWF0IG9yZy1jb2x1bW5zLWN1cnJlbnQtZm10KQog CSAgICAgKGJ1ZmZlciAobWFya2VyLWJ1ZmZlciBwb20pKQogCSAgICAgKG9yZy1hZ2VuZGEtY29u dHJpYnV0aW5nLWZpbGVzCiAJICAgICAgKGxpc3QgKHdpdGgtY3VycmVudC1idWZmZXIgYnVmZmVy CkBAIC03MjIsNyArNzMxLDcgQEAgYW4gaW50ZWdlciwgc2VsZWN0IHRoYXQgdmFsdWUuIgogCShv cmctY29sdW1ucy0tY2FsbCBhY3Rpb24pCiAJOzsgVGhlIGZvbGxvd2luZyBsZXQgcHJlc2VydmVz IHRoZSBjdXJyZW50IGZvcm1hdCwgYW5kIG1ha2VzCiAJOzsgc3VyZSB0aGF0IGluIG9ubHkgYSBz aW5nbGUgZmlsZSB0aGluZ3MgbmVlZCB0byBiZSB1cGRhdGVkLgotCShsZXQqICgob3JnLWFnZW5k YS1vdmVycmlkaW5nLWNvbHVtbnMtZm9ybWF0IG9yZy1jb2x1bW5zLWN1cnJlbnQtZm10KQorCShs ZXQqICgob3JnLW92ZXJyaWRpbmctY29sdW1ucy1mb3JtYXQgb3JnLWNvbHVtbnMtY3VycmVudC1m bXQpCiAJICAgICAgIChidWZmZXIgKG1hcmtlci1idWZmZXIgcG9tKSkKIAkgICAgICAgKG9yZy1h Z2VuZGEtY29udHJpYnV0aW5nLWZpbGVzCiAJCShsaXN0ICh3aXRoLWN1cnJlbnQtYnVmZmVyIGJ1 ZmZlcgpAQCAtMTU2Myw3ICsxNTcyLDggQEAgUEFSQU1TIGlzIGEgcHJvcGVydHkgbGlzdCBvZiBw YXJhbWV0ZXJzOgogICAobGV0KiAoKG9yZy1jb2x1bW5zLS10aW1lIChmbG9hdC10aW1lKSkKIAkg KGZtdAogCSAgKGNvbmQKLQkgICAoKGJvdW5kLWFuZC10cnVlLXAgb3JnLWFnZW5kYS1vdmVycmlk aW5nLWNvbHVtbnMtZm9ybWF0KSkKKwkgICAoKGJvdW5kLWFuZC10cnVlLXAgb3JnLW92ZXJyaWRp bmctY29sdW1ucy1mb3JtYXQpKQorCSAgICgoYm91bmQtYW5kLXRydWUtcCBvcmctbG9jYWwtY29s dW1ucy1mb3JtYXQpKQogCSAgICgobGV0ICgobSAob3JnLWdldC1hdC1ib2wgJ29yZy1oZC1tYXJr ZXIpKSkKIAkgICAgICAoYW5kIG0KIAkJICAgKG9yIChvcmctZW50cnktZ2V0IG0gIkNPTFVNTlMi IHQpCi0tIAoyLjIwLjEKCg== --00000000000062fd940582b35af0--