Re: [PATCH v3 00/34] A great number of cosmetic changes
Tomi Ollila writes: > > --ignore-whitespace could help... > > for the --no-keep-cr (the default) not to work, in thread containing this > >https://lkml.org/lkml/2019/12/1/69 > > may give some hint why the situation is as unclear as it is now... --ignore-whitespace adds CRs to the files, which is pretty ick. I ended up writing a python script to massage the patches, and added that to my patch application alias. The series is now applied to master. email-to-8bit Description: Binary data ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
Re: [PATCH v3 00/34] A great number of cosmetic changes
On Sun, Aug 09 2020, David Bremner wrote: > Jonas Bernoulli writes: >> >> Jonas Bernoulli (34): >> emacs: Shorten long lines >> emacs: Remove excess empty lines > > > These patches (and Đoàn Trần Công Danh's that I just applied by hand) > both seem to have problem with base64 encoded patches documented at. > > https://lore.kernel.org/git/20191218194144.gl17...@pobox.com/ > > It seems that the patches have CRLF line endings inside the base64 > encoding, and git fails to strip the CRs. > > I'm not sure why this happens for some patches and not for others; > I hope there is not re-encoding happening on the mailing list. If there > is we should fix that. > > The practical upshot is that I can't really apply such a long series by > hand. Ideas welcome. A short term fix would be to fetch a ref from > somewhere. OTOH, I hope this isn't going to be a recurring problem. --ignore-whitespace could help... for the --no-keep-cr (the default) not to work, in thread containing this https://lkml.org/lkml/2019/12/1/69 may give some hint why the situation is as unclear as it is now... Tomi > d ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
Re: [PATCH v3 00/34] A great number of cosmetic changes
David Bremner writes: > A short term fix would be to fetch a ref from somewhere. You can fetch it with: git fetch https://github.com/tarsiiformes/notmuch.git cleanup Jonas ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
Re: [PATCH v3 00/34] A great number of cosmetic changes
Đoàn Trần Công Danh writes: > On 2020-08-09 09:09:39-0300, David Bremner wrote: >> Jonas Bernoulli writes: >> > >> > Jonas Bernoulli (34): >> > emacs: Shorten long lines >> > emacs: Remove excess empty lines >> >> >> These patches (and Đoàn Trần Công Danh's that I just applied by hand) >> both seem to have problem with base64 encoded patches documented at. >> >> https://lore.kernel.org/git/20191218194144.gl17...@pobox.com/ >> >> It seems that the patches have CRLF line endings inside the base64 >> encoding, and git fails to strip the CRs. >> >> I'm not sure why this happens for some patches and not for others; >> I hope there is not re-encoding happening on the mailing list. If there >> is we should fix that. > > It seems like the mailing list base64-encodes utf-8 email. > My email will be sent in utf-8 for obvious reason. > > I don't know about Jonas's, some of them are in utf-8 and some other > is in plain ascii. That seems to be it. I don't remember the exact question but when sending I was asked about what encoding to use and I confirmed the default, which was utf-8. Usually I am not asked this question. Jonas ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
Re: [PATCH v3 00/34] A great number of cosmetic changes
On 2020-08-09 09:09:39-0300, David Bremner wrote: > Jonas Bernoulli writes: > > > > Jonas Bernoulli (34): > > emacs: Shorten long lines > > emacs: Remove excess empty lines > > > These patches (and Đoàn Trần Công Danh's that I just applied by hand) > both seem to have problem with base64 encoded patches documented at. > > https://lore.kernel.org/git/20191218194144.gl17...@pobox.com/ > > It seems that the patches have CRLF line endings inside the base64 > encoding, and git fails to strip the CRs. > > I'm not sure why this happens for some patches and not for others; > I hope there is not re-encoding happening on the mailing list. If there > is we should fix that. It seems like the mailing list base64-encodes utf-8 email. My email will be sent in utf-8 for obvious reason. I don't know about Jonas's, some of them are in utf-8 and some other is in plain ascii. -- Danh ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
Re: [PATCH v3 00/34] A great number of cosmetic changes
Jonas Bernoulli writes: > > Jonas Bernoulli (34): > emacs: Shorten long lines > emacs: Remove excess empty lines These patches (and Đoàn Trần Công Danh's that I just applied by hand) both seem to have problem with base64 encoded patches documented at. https://lore.kernel.org/git/20191218194144.gl17...@pobox.com/ It seems that the patches have CRLF line endings inside the base64 encoding, and git fails to strip the CRs. I'm not sure why this happens for some patches and not for others; I hope there is not re-encoding happening on the mailing list. If there is we should fix that. The practical upshot is that I can't really apply such a long series by hand. Ideas welcome. A short term fix would be to fetch a ref from somewhere. OTOH, I hope this isn't going to be a recurring problem. d ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
Re: [PATCH v3 00/34] A great number of cosmetic changes
Tomi Ollila writes: > I made a quick check of release dates of emacs 25.1, gmime 3 and xapian 1.4 > -- gmime 3 released early 2017, xapian 1.4 middle of 2016 and emacs 25.1 > sept 2016 -- so requiring emacs 25.1 is pretty much aligned to those > releases and therefore dropping emacs 24 support looks good to me. Great! >> That resulted in a few new commits of course, marked with * below. >> And since I had to add some commit anyway, I also added three other >> minor commits, marked with ^ below. > > I checked the new commits, looks good to me. I also was preparing dropping > emacs 23 support code and the changes aligned what I tried. Interestinglyy > this change in notmuch-mua.el: > ;; There is a bug in emacs 23's message.el that results in a newline > ;; not being inserted after the References header, so the next header > ;; is concatenated to the end of it. > Is still effective in emacs 26.3 -- I wonder whether there is something > wrong notmuch-emacs handles the case `notmuch-mua-insert-references` is > needed. I'll have a look. > I trust the earlier changes are the same as in v2 and v1 Almost. In "emacs: Increase consistency of library headers" I did bring the headers of "notmuch-compat.el" and "emacs/notmuch-version.el.tmpl" more in line. But that's it. Jonas ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
Re: [PATCH v3 00/34] A great number of cosmetic changes
On Sat, Aug 08 2020, Jonas Bernoulli wrote: > David Bremner writes: > >> Tomi Ollila writes: > >>> So we have 3 options: >>> >>> 1) apply this patch and now drop support for emacs 24 >>> >>> 2) apply this patch and somehow infor emacs 24 users to install cl-lib from >>> ELPA >> >> I'm fine with either of these options. I'd hope we can specify what >> versions we need in emacs/notmuch-pkg.el.templ > > I went with option 1: drop support for emacs 24. Instead of just > adding a NEWS entry and bump a number, I also removed some old cruft > that was only necessary for emacs 24 (and in some cases emacs 23!). I made a quick check of release dates of emacs 25.1, gmime 3 and xapian 1.4 -- gmime 3 released early 2017, xapian 1.4 middle of 2016 and emacs 25.1 sept 2016 -- so requiring emacs 25.1 is pretty much aligned to those releases and therefore dropping emacs 24 support looks good to me. > That resulted in a few new commits of course, marked with * below. > And since I had to add some commit anyway, I also added three other > minor commits, marked with ^ below. I checked the new commits, looks good to me. I also was preparing dropping emacs 23 support code and the changes aligned what I tried. Interestinglyy this change in notmuch-mua.el: ;; There is a bug in emacs 23's message.el that results in a newline ;; not being inserted after the References header, so the next header ;; is concatenated to the end of it. Is still effective in emacs 26.3 -- I wonder whether there is something wrong notmuch-emacs handles the case `notmuch-mua-insert-references` is needed. I trust the earlier changes are the same as in v2 and v1 Tomi > > Cheers, > Jonas > > Jonas Bernoulli (34): > emacs: Shorten long lines > emacs: Remove excess empty lines > emacs: Fix indentation > emacs: Closing parenthesis go on the same line > emacs: Only set one variable per setq form > emacs: Use 'and' instead of 'when' when the return value matters > emacs: Use 'unless' instead of 'when' and 'not' > emacs: Use 'when' instead of 'if' when there is no ELSE part > emacs: Use one or three lines for 'if' forms > emacs: Extend face to window edge again > emacs: Fix some function declarations > emacs: No longer define notmuch-hello-mode-map as a function > emacs: notmuch-poll: Let the user know we are polling > emacs: Use makefile-gmake-mode in Makefile*s > emacs: Improve doc-strings > emacs: Autoload notmuch-jump-search only once > emacs: Autoload notmuch-jump using an autoload cookie > emacs: Various cosmetic changes > emacs: Increase consistency of library headers > Fix typos > .dir-locals.el: Set variables for correct "shell" mode > test: Fix indentation > ^ .gitignore: Sort using sort-lines > ^ emacs: Provide 'rstdoc' feature at end of file > ^ emacs: Add end-of-file line to libraries that lack it > * NEWS: Add stub for 0.31 > * NEWS: At least Emacs 25.1 is required now > * emacs: Use cl-incf where appropriate > * emacs: Remove notmuch-setq-local > * emacs: Remove notmuch-read-char-choice > * emacs: Drop old advices that were only need for Emacs 23 > * emacs: Do not abuse advice to monkey patch while testing > * emacs: Use new advice mechanism do advice mm-shr > * try-emacs-mua: Trim `require' advice for Emacs 25 > > .dir-locals.el | 2 +- > .gitignore | 28 +- > Makefile.global| 1 + > Makefile.local | 2 +- > NEWS | 10 +- > bindings/Makefile.local| 2 +- > bindings/python-cffi/notmuch2/__init__.py | 2 +- > bindings/python-cffi/notmuch2/_base.py | 6 +- > bindings/python-cffi/notmuch2/_database.py | 8 +- > bindings/python-cffi/notmuch2/_message.py | 4 +- > bindings/python-cffi/notmuch2/_tags.py | 8 +- > bindings/python-cffi/tests/conftest.py | 2 +- > bindings/python/notmuch/database.py| 12 +- > bindings/python/notmuch/query.py | 2 +- > compat/Makefile.local | 2 +- > completion/Makefile.local | 2 +- > devel/try-emacs-mua| 26 +- > doc/Makefile.local | 2 +- > emacs/Makefile.local | 2 +- > emacs/coolj.el | 24 +- > emacs/make-deps.el | 7 +- > emacs/notmuch-address.el | 188 - > emacs/notmuch-company.el | 56 +-- > emacs/notmuch-compat.el| 88 + > emacs/notmuch-crypto.el| 49 ++- > emacs/notmuch-draft.el | 24 +- > emacs/notmuch-hello.el | 102 +++-- > emacs/notmuch-jump.el | 61 ++- > emacs/notmuch-lib.el | 202 +- > emacs/notmuch-maildir-fcc.el | 122 +++--- > emacs/notmuch-messa
[PATCH v3 00/34] A great number of cosmetic changes
David Bremner writes: > Tomi Ollila writes: >> So we have 3 options: >> >> 1) apply this patch and now drop support for emacs 24 >> >> 2) apply this patch and somehow infor emacs 24 users to install cl-lib from >> ELPA > > I'm fine with either of these options. I'd hope we can specify what > versions we need in emacs/notmuch-pkg.el.templ I went with option 1: drop support for emacs 24. Instead of just adding a NEWS entry and bump a number, I also removed some old cruft that was only necessary for emacs 24 (and in some cases emacs 23!). That resulted in a few new commits of course, marked with * below. And since I had to add some commit anyway, I also added three other minor commits, marked with ^ below. Cheers, Jonas Jonas Bernoulli (34): emacs: Shorten long lines emacs: Remove excess empty lines emacs: Fix indentation emacs: Closing parenthesis go on the same line emacs: Only set one variable per setq form emacs: Use 'and' instead of 'when' when the return value matters emacs: Use 'unless' instead of 'when' and 'not' emacs: Use 'when' instead of 'if' when there is no ELSE part emacs: Use one or three lines for 'if' forms emacs: Extend face to window edge again emacs: Fix some function declarations emacs: No longer define notmuch-hello-mode-map as a function emacs: notmuch-poll: Let the user know we are polling emacs: Use makefile-gmake-mode in Makefile*s emacs: Improve doc-strings emacs: Autoload notmuch-jump-search only once emacs: Autoload notmuch-jump using an autoload cookie emacs: Various cosmetic changes emacs: Increase consistency of library headers Fix typos .dir-locals.el: Set variables for correct "shell" mode test: Fix indentation ^ .gitignore: Sort using sort-lines ^ emacs: Provide 'rstdoc' feature at end of file ^ emacs: Add end-of-file line to libraries that lack it * NEWS: Add stub for 0.31 * NEWS: At least Emacs 25.1 is required now * emacs: Use cl-incf where appropriate * emacs: Remove notmuch-setq-local * emacs: Remove notmuch-read-char-choice * emacs: Drop old advices that were only need for Emacs 23 * emacs: Do not abuse advice to monkey patch while testing * emacs: Use new advice mechanism do advice mm-shr * try-emacs-mua: Trim `require' advice for Emacs 25 .dir-locals.el | 2 +- .gitignore | 28 +- Makefile.global| 1 + Makefile.local | 2 +- NEWS | 10 +- bindings/Makefile.local| 2 +- bindings/python-cffi/notmuch2/__init__.py | 2 +- bindings/python-cffi/notmuch2/_base.py | 6 +- bindings/python-cffi/notmuch2/_database.py | 8 +- bindings/python-cffi/notmuch2/_message.py | 4 +- bindings/python-cffi/notmuch2/_tags.py | 8 +- bindings/python-cffi/tests/conftest.py | 2 +- bindings/python/notmuch/database.py| 12 +- bindings/python/notmuch/query.py | 2 +- compat/Makefile.local | 2 +- completion/Makefile.local | 2 +- devel/try-emacs-mua| 26 +- doc/Makefile.local | 2 +- emacs/Makefile.local | 2 +- emacs/coolj.el | 24 +- emacs/make-deps.el | 7 +- emacs/notmuch-address.el | 188 - emacs/notmuch-company.el | 56 +-- emacs/notmuch-compat.el| 88 + emacs/notmuch-crypto.el| 49 ++- emacs/notmuch-draft.el | 24 +- emacs/notmuch-hello.el | 102 +++-- emacs/notmuch-jump.el | 61 ++- emacs/notmuch-lib.el | 202 +- emacs/notmuch-maildir-fcc.el | 122 +++--- emacs/notmuch-message.el | 3 +- emacs/notmuch-mua.el | 185 - emacs/notmuch-parser.el| 16 +- emacs/notmuch-pkg.el.tmpl | 3 +- emacs/notmuch-print.el | 2 +- emacs/notmuch-query.el | 29 +- emacs/notmuch-show.el | 439 ++--- emacs/notmuch-tag.el | 43 +- emacs/notmuch-tree.el | 189 - emacs/notmuch-version.el.tmpl | 3 +- emacs/notmuch-wash.el | 109 +++-- emacs/notmuch.el | 278 ++--- emacs/rstdoc.el| 22 +- lib/Makefile.local | 2 +- lib/notmuch.h | 4 +- parse-time-string/Makefile.local | 2 + performance-test/Makefile.local| 2 +- tag-util.c | 2 +- tag-util.h | 2 +- test/Makefile.local|
