-
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0001-neomutt-customisations.patch
2739 lines (2620 loc) · 95.7 KB
/
0001-neomutt-customisations.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From 063e3de423493ac8a34fed08969466ce1f4ab87b Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Fri, 25 Mar 2016 18:30:01 +0000
Subject: [PATCH] neomutt customisations
---
.gitignore | 56 +++++++++
ChangeLog.neomutt | 196 +++++++++++++++++++++++++++++++
GPL | 194 +++++++++++++++---------------
Makefile.am | 49 ++++----
README | 28 -----
README.mutt | 28 +++++
README.neomutt | 94 +++++++++++++++
VERSION.neo | 1 +
configure.ac | 142 ++++++++++++----------
contrib/Makefile.am | 19 ++-
doc/Makefile.am | 28 ++---
doc/manual.xml.head | 99 +++++++++++-----
doc/muttbug.man | 200 -------------------------------
git-version-gen | 226 +++++++++++++++++++++++++++++++++++
hdrline.c | 8 +-
imap/command.c | 7 +-
init.c | 91 ++++++++------
mkchangelog.sh | 5 -
muttbug | 3 -
muttbug.sh.in | 332 ----------------------------------------------------
muttlib.c | 40 +++++++
patchlist.sh | 18 +--
protos.h | 6 +
version.c | 12 +-
version.sh | 61 +---------
25 files changed, 1023 insertions(+), 920 deletions(-)
create mode 100644 .gitignore
create mode 100644 ChangeLog.neomutt
delete mode 100644 README
create mode 100644 README.mutt
create mode 100644 README.neomutt
create mode 100644 VERSION.neo
delete mode 100644 doc/muttbug.man
create mode 100644 git-version-gen
delete mode 100755 mkchangelog.sh
delete mode 100755 muttbug
delete mode 100644 muttbug.sh.in
mode change 100644 => 100755 version.sh
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..80d5ffc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,56 @@
+# Wildcard ignores
+*.o
+*.a
+*.in
+
+# Ignore these files in all subdirectories
+**/Makefile
+
+# Ignore directories
+**/.deps/
+autom4te.cache/
+
+# Wildcard ignored within subdirectories
+po/*.gmo
+doc/*.html
+doc/*.1
+
+doc/instdoc.sh
+doc/Muttrc
+doc/makedoc
+doc/manual.txt
+doc/manual.xml
+doc/muttrc.man
+doc/stamp-doc-chunked
+doc/stamp-doc-rc
+doc/stamp-doc-xml
+
+po/POTFILES
+
+.version
+aclocal.m4
+compile
+config.guess
+config.h
+config.log
+config.status
+config.sub
+configure
+conststrings.c
+depcomp
+hcachever.sh
+hcversion.h
+install-sh
+keymap_defs.h
+missing
+mutt
+mutt_dotlock
+mutt_dotlock.c
+mutt_md5
+patchlist.c
+pgpewrap
+pgpring
+reldate.h
+smime_keys
+stamp-h1
+txt2c
diff --git a/ChangeLog.neomutt b/ChangeLog.neomutt
new file mode 100644
index 0000000..b175c80
--- /dev/null
+++ b/ChangeLog.neomutt
@@ -0,0 +1,196 @@
+2016-08-26 Richard Russon <rich@flatcap.org>
+* Build
+ - Disable fmemopen until bug is fixed
+* Contrib
+ - Keybase portability improvements
+ Joshua Jordi (JakkinStewart)
+* Bug Fixes
+ - Fix notmuch crash toggling virtual folders
+ - Fix display of pager index when sidebar toggled
+
+2016-08-21 Richard Russon <rich@flatcap.org>
+* Contrib
+ - Updates to Keybase Support
+ Joshua Jordi (JakkinStewart)
+* Bug Fixes
+ - Fix data-loss when appending a compressed file
+ - Don't paint invisible progress bars
+ - Revert to Mutt keybindings
+ - Don't de-tag emails after labelling them
+ - Don't whine if getrandom() fails
+ Adam Borowski (kilobyte)
+ - Fix display when 'from' field is invalid
+* Config
+ - Support for $XDG_CONFIG_HOME and $XDG_CONFIG_DIRS
+ Marco Hinz (mhinz)
+* Docs
+ - Fix DocBook validation
+ - Document NotMuch queries
+* Build
+ - More Autoconf improvements
+ Darshit Shah (darnir)
+ - Create Distribution Tarballs with autogen sources
+ Darshit Shah (darnir)
+
+2016-08-08 Richard Russon <rich@flatcap.org>
+* New Features
+ - Timeout Hook - Run a command periodically
+ - Multiple fcc - Save multiple copies of outgoing mail
+* Contrib
+ - Keybase Integration
+ Joshua Jordi (JakkinStewart)
+* Devel
+ - Attached - Prevent missing attachments
+ Darshit Shah (darnir)
+ - Virtual Unmailboxes - Remove unwanted virtual mailboxes
+ Richard Russon (flatcap)
+* Bug Fixes
+ - Sidebar's inbox occasionally shows zero/wrong value
+ - Fix crash opening a second compressed mailbox
+* Config
+ - Look for /etc/NeoMuttrc and ~/.neomuttrc
+* Docs
+ - Fix broken links, typos
+ - Update project link
+ - Fix version string in the manual
+* Build
+ - Add option to disable fmemopen
+ - Install all the READMEs and contribs
+ - Big overhaul of the build
+ Darshit Shah (darnir)
+
+2016-07-23 Richard Russon <rich@flatcap.org>
+* New Motto: "Teaching an Old Dog New Tricks"
+ - Thanks to Alok Singh
+* New Features
+ - New Mail Command - Execute a command on receipt of new mail
+ - vim-keybindings - Mutt config for vim users
+ - LMDB: In-memory header caching database
+ - SMIME Encrypt to Self - Secure storage of sensitive email
+* Bug Fixes
+ - rework mutt_draw_statusline()
+ - fix cursor position after sidebar redraw
+ - Add sidebar_format flag '%n' to display 'N' on new mail.
+ - fix index_format truncation problem
+ - Fix compiler warnings due to always true condition
+ - Change sidebar next/prev-new to look at buffy->new too.
+ - Change the default for sidebar_format to use %n.
+ - sidebar "unsorted" order to match Buffy list order.
+ - Include ncurses tinfo library if found.
+ - Sidebar width problem
+ - sidebar crash for non-existent mailbox
+ - Temporary compatibility workaround
+ - Reset buffy->new for the current mailbox in IMAP.
+ - version.sh regression
+ - crash when notmuch tries to read a message
+ - status line wrapping
+* Docs
+ - Mass tidy up of the docs
+ - Fix xml validation
+ - Add missing docs for new features
+* Travis
+ - New build system:
+ https://github.com/neomutt/travis-build
+ Now we have central control over what gets built
+
+2016-07-09 Richard Russon <rich@flatcap.org>
+* Bug-fixes
+ - This release was a temporary measure
+
+2016-06-11 Richard Russon <rich@flatcap.org>
+* Change in behaviour
+ - Temporarily disable $sidebar_refresh_time
+ Unfortunately, this was causing too many problems.
+ It will be fixed and re-enabled as soon as possible.
+* Bug Fixes
+ - Fix several crashes, on startup, in Keywords
+ - Reflow text now works as it should
+ - Lots of typos fixed
+ - Compress config bug prevented it working
+ - Some minor bug-fixes from mutt/default
+ - Single quote at line beginning misinterpreted by groff
+ - Setting $sidebar_width to more than 128 would cause bad things to happen.
+ - Fix alignment in the compose menu.
+ - Fix sidebar buffy stats updating on mailbox close.
+* Build Changes
+ - Sync whitespace to mutt/default
+ - Alter ChangeLog date format to simplify Makefiles
+ - Use the new notmuch functions that return a status
+ - Rename sidebar functions sb_* -> mutt_sb_*
+
+2016-05-23 Richard Russon <rich@flatcap.org>
+* New Features:
+ - Keywords: Email Label/Keywords/Tagging
+ - Compress: Compressed mailboxes support
+ - NNTP: Talk to a usenet news server
+ - Separate mappings for <enter> and <return>
+ - New configure option: --enable-quick-build
+ - Various build fixes
+
+2016-05-02 Richard Russon <rich@flatcap.org>
+* Update for Mutt-1.6.0
+* Bug Fixes:
+ - Build for Notmuch works if Sidebar is disabled
+ - Sidebar functions work even if the Sidebar is hidden
+ - sidebar-next-new, etc, only find *new* mail, as documented
+ - Notmuch supports *very* long queries
+
+2016-04-16 Richard Russon <rich@flatcap.org>
+* Big Bugfix Release
+* Bug Fixes:
+ - Fix crash caused by sidebar_folder_indent
+ - Allow the user to change mailboxes again
+ - Correct sidebar's messages counts
+ - Only sort the sidebar if we're asked to
+ - Fix refresh of pager when toggling the sidebar
+ - Compose mode: make messages respect the TITLE_FMT
+ - Conditional include if sys/syscall.h
+ - Build fix for old compilers
+ - Try harder to keep track of the open mailbox
+* Changes to Features
+ - Allow sidebar_divider_char to be longer
+ (it was limited to one character)
+ - Ignore case when sorting the sidebar alphabetically
+* Other Changes
+ - Numerous small tweaks to the docs
+ - Lots of minor code tidy-ups
+ - Enabling NotMuch now forcibly enables Sidebar
+ (it is dependent on it, for now)
+ - A couple of bug fixes from mutt/stable
+
+2016-04-04 Richard Russon <rich@flatcap.org>
+* Update for Mutt-1.6.0
+* No other changes in this release
+
+2016-03-28 Richard Russon <rich@flatcap.org>
+* New Features
+ - skip-quoted - skip quoted text
+ - limit-current-thread - limit index view to current thread
+* Sidebar Intro - A Gentle Introduction to the Sidebar (with pictures).
+
+2016-03-20 Richard Russon <rich@flatcap.org>
+* Numerous small bugfixes
+* TravisCI integration
+
+2016-03-17 Richard Russon <rich@flatcap.org>
+* New Features
+ - notmuch - email search support
+ - ifdef - improvements
+
+2016-03-07 Richard Russon <rich@flatcap.org>
+* First NeoMutt release
+* List of Features:
+ - bug-fixes - various bug fixes
+ - cond-date - use rules to choose date format
+ - fmemopen - use memory buffers instead of files
+ - ifdef - conditional config options
+ - index-color - theme the email index
+ - initials - expando for author's initials
+ - nested-if - allow deeply nested conditions
+ - progress - show a visual progress bar
+ - quasi-delete - mark emails to be hidden
+ - sidebar - overview of mailboxes
+ - status-color - theming the status bar
+ - tls-sni - negotiate for a certificate
+ - trash - move 'deleted' emails to a trash bin
+
diff --git a/GPL b/GPL
index b6f92f3..0daa041 100644
--- a/GPL
+++ b/GPL
@@ -1,73 +1,74 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+GNU General Public License
+==========================
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+_Version 2, June 1991_
+_Copyright © 1989, 1991 Free Software Foundation, Inc.,_
+_51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA_
- Preamble
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
- The licenses for most software are designed to take away your
+### Preamble
+
+The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
- When we speak of free software, we are referring to freedom, not
+When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
- To protect your rights, we need to make restrictions that forbid
+To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
- For example, if you distribute copies of such a program, whether
+For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
+We protect your rights with two steps: **(1)** copyright the software, and
+**(2)** offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
- Also, for each author's protection and ours, we want to make certain
+Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
- Finally, any free program is threatened constantly by software
+Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
- The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License applies to any program or other work which contains
+### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+**0.** This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
+under the terms of this General Public License. The “Program”, below,
+refers to any such program or work, and a “work based on the Program”
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
+the term “modification”.) Each licensee is addressed as “you”.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
@@ -76,7 +77,7 @@ is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
- 1. You may copy and distribute verbatim copies of the Program's
+**1.** You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
@@ -87,30 +88,28 @@ along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
- 2. You may modify your copy or copies of the Program or any portion
+**2.** You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
+* **a)** You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+* **b)** You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any
+part thereof, to be licensed as a whole at no charge to all third
+parties under the terms of this License.
+* **c)** If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such
+interactive use in the most ordinary way, to print or display an
+announcement including an appropriate copyright notice and a
+notice that there is no warranty (or else, saying that you provide
+a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this
+License. (Exception: if the Program itself is interactive but
+does not normally print such an announcement, your work based on
+the Program is not required to print an announcement.)
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -131,26 +130,24 @@ with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
- 3. You may copy and distribute the Program (or a work based on it,
+**3.** You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
+* **a)** Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections
+1 and 2 above on a medium customarily used for software interchange; or,
+* **b)** Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your
+cost of physically performing source distribution, a complete
+machine-readable copy of the corresponding source code, to be
+distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+* **c)** Accompany it with the information you received as to the offer
+to distribute corresponding source code. (This alternative is
+allowed only for noncommercial distribution and only if you
+received the program in object code or executable form with such
+an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
@@ -168,8 +165,8 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
+
+**4.** You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
@@ -177,7 +174,7 @@ However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
- 5. You are not required to accept this License, since you have not
+**5.** You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
@@ -186,7 +183,7 @@ Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
- 6. Each time you redistribute the Program (or any work based on the
+**6.** Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
@@ -194,7 +191,7 @@ restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
- 7. If, as a consequence of a court judgment or allegation of patent
+**7.** If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
@@ -225,8 +222,8 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
+
+**8.** If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
@@ -234,20 +231,20 @@ those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
- 9. The Free Software Foundation may publish revised and/or new versions
+**9.** The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
+specifies a version number of this License which applies to it and “any
+later version”, you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
- 10. If you wish to incorporate parts of the Program into other free
+**10.** If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
@@ -255,19 +252,19 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+### NO WARRANTY
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
@@ -277,36 +274,35 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+END OF TERMS AND CONDITIONS
- If you develop a new program, and you want it to be of the greatest
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
- To do so, attach the following notices to the program. It is safest
+To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
+the “copyright” line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
@@ -318,23 +314,23 @@ when it starts in an interactive mode:
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
-The hypothetical commands `show w' and `show c' should show the appropriate
+The hypothetical commands `show w` and `show c` should show the appropriate
parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
+be called something other than `show w` and `show c`; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
+school, if any, to sign a “copyright disclaimer” for the program, if
necessary. Here is a sample; alter the names:
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff --git a/Makefile.am b/Makefile.am
index cfdb258..aa190b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,15 +10,19 @@ IMAP_SUBDIR = imap
IMAP_INCLUDES = -I$(top_srcdir)/imap
endif
+if QUICK_BUILD
+SUBDIRS = $(IMAP_SUBDIR)
+else
SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+endif
-bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
+bin_SCRIPTS = $(SMIMEAUX_TARGET)
if BUILD_HCACHE
HCVERSION = hcversion.h
endif
-BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
+BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c hcachever.sh $(HCVERSION) $(top_srcdir)/.version
bin_PROGRAMS = mutt $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
mutt_SOURCES = \
@@ -61,21 +65,22 @@ EXTRA_mutt_SOURCES = account.c bcache.c compress.c crypt-gpgme.c crypt-mod-pgp-c
bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h
EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
- configure account.h \
+ account.h \
attach.h buffy.h charset.h compress.h copy.h crypthash.h dotlock.h functions.h gen_defs \
globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
mx.h pager.h pgp.h pop.h protos.h rfc1524.h rfc2047.h \
- rfc2231.h rfc822.h rfc3676.h sha1.h sort.h mime.types VERSION prepare \
+ rfc2231.h rfc822.h rfc3676.h sha1.h sort.h mime.types VERSION \
nntp.h ChangeLog.nntp \
_regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h \
- README.SSL smime.h group.h \
- muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
- ChangeLog mkchangelog.sh mutt_idna.h sidebar.h OPS.SIDEBAR \
+ README.SSL README.md README.neomutt smime.h group.h \
+ pgppacket.h depcomp ascii.h PATCHES patchlist.sh \
+ ChangeLog ChangeLog.neomutt mutt_idna.h sidebar.h OPS.SIDEBAR \
snprintf.c regex.c crypt-gpgme.h hcachever.sh.in sys_socket.h \
- txt2c.c txt2c.sh version.sh check_sec.sh version.h
+ txt2c.c txt2c.sh version.sh version.h \
+ $(top_srcdir)/.version git-version-gen
EXTRA_SCRIPTS = smime_keys
@@ -85,7 +90,7 @@ mutt_LDADD += $(NOTMUCH_LIBS)
endif
# kz
-EXTRA_DIST += UPDATING.kz README.notmuch OPS.NOTMUCH
+EXTRA_DIST += UPDATING.kz OPS.NOTMUCH
@@ -124,15 +129,17 @@ conststrings.c: txt2c config.status
CLEANFILES = mutt_dotlock.c keymap_alldefs.h $(BUILT_SOURCES)
-DISTCLEANFILES= flea smime_keys txt2c po/$(PACKAGE).pot
+DISTCLEANFILES= smime_keys txt2c po/$(PACKAGE).pot
ACLOCAL_AMFLAGS = -I m4
LDADD = $(LIBOBJS) $(INTLLIBS)
-flea: muttbug.sh
- cp muttbug.sh flea
- chmod +x flea
+$(top_srcdir)/.version:
+ echo $(VERSION) > $@-t && mv $@-t $@
+
+dist-hook:
+ echo $(VERSION) > $(distdir)/.tarball-version
smime_keys: $(srcdir)/smime_keys.pl
cp $(srcdir)/smime_keys.pl smime_keys
@@ -147,8 +154,9 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.NOTMUCH $(sr
$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
> keymap_alldefs.h
-reldate.h: $(srcdir)/ChangeLog
- echo 'const char *ReleaseDate = "'`head -n 1 $(srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1`'";' > reldate.h.tmp; \
+reldate.h:
+ date=`head -n 1 $(top_srcdir)/ChangeLog.neomutt | LC_ALL=C cut -b 1-10` && \
+ echo 'const char *ReleaseDate = "'$$date'";' > reldate.h.tmp; \
cmp -s reldate.h.tmp reldate.h || cp reldate.h.tmp reldate.h; \
rm reldate.h.tmp
@@ -196,17 +204,6 @@ pclean:
check-security:
(cd $(top_srcdir) && ./check_sec.sh)
-commit:
- @echo "make commit is obsolete; use hg-commit"; false
-
-update-changelog:
- (cd $(top_srcdir); \
- sh ./mkchangelog.sh | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
- $${VISUAL:-vi} ChangeLog)
-
-mutt-dist:
- (cd $(srcdir) && ./build-release )
-
update-doc:
(cd doc && $(MAKE) update-doc)
diff --git a/README b/README
deleted file mode 100644
index 70ef0c2..0000000
--- a/README
+++ /dev/null
@@ -1,28 +0,0 @@
-README for mutt-1.5
-===================
-
-When updating mutt from an earlier release or from Mercurial, please
-make sure to read the compatibility notes in ``UPDATING''. Older changes
-between mutt-1.2 and mutt-1.4 are listed in NEWS.
-
-If you got the mutt source code from the public Mercurial repository
-(http://dev.mutt.org/hg/mutt/), please read doc/devel-notes.txt to make
-sure that you have a complete development environment.
-
-Installation instructions are detailed in ``INSTALL''. The user manual
-is in doc/manual.txt. PGP users should read doc/PGP-Notes.txt.
-
-Before you start hacking on mutt, read doc/devel-notes.txt. Before
-applying patches to mutt, read doc/applying-patches.txt. Please,
-read these files, as they will save you from asking FAQs.
-
-For more information, see the Mutt home page:
-
- http://www.mutt.org/
-
-The primary distribution points for Mutt is:
-
- ftp://ftp.mutt.org/pub/mutt
-
-A list of mirror sites can be found under
-<http://www.mutt.org/download.html>.
diff --git a/README.mutt b/README.mutt
new file mode 100644
index 0000000..70ef0c2
--- /dev/null
+++ b/README.mutt
@@ -0,0 +1,28 @@
+README for mutt-1.5
+===================
+
+When updating mutt from an earlier release or from Mercurial, please
+make sure to read the compatibility notes in ``UPDATING''. Older changes
+between mutt-1.2 and mutt-1.4 are listed in NEWS.
+
+If you got the mutt source code from the public Mercurial repository
+(http://dev.mutt.org/hg/mutt/), please read doc/devel-notes.txt to make
+sure that you have a complete development environment.
+
+Installation instructions are detailed in ``INSTALL''. The user manual
+is in doc/manual.txt. PGP users should read doc/PGP-Notes.txt.
+
+Before you start hacking on mutt, read doc/devel-notes.txt. Before
+applying patches to mutt, read doc/applying-patches.txt. Please,
+read these files, as they will save you from asking FAQs.
+
+For more information, see the Mutt home page:
+
+ http://www.mutt.org/
+
+The primary distribution points for Mutt is:
+
+ ftp://ftp.mutt.org/pub/mutt
+
+A list of mirror sites can be found under
+<http://www.mutt.org/download.html>.
diff --git a/README.neomutt b/README.neomutt
new file mode 100644
index 0000000..f0d2b23
--- /dev/null
+++ b/README.neomutt
@@ -0,0 +1,94 @@
+# This is the NeoMutt Project
+
+## What is NeoMutt?
+
+* NeoMutt is a project of projects.
+* A place to gather all the patches against Mutt.
+* A place for all the developers to gather.
+
+Hopefully this will build the community and reduce duplicated effort.
+
+NeoMutt was created when Richard Russon (FlatCap) took all the old Mutt patches,
+sorted through them, fixed them up and documented them.
+
+## What Features does NeoMutt have?
+
+| Name | Description
+|----------------------|-------------------------------------------------------
+| Compressed Folders | Read from/write to compressed mailboxes
+| Conditional Dates | Conditional Date Formatting
+| Fmemopen | Use fmemopen(3) for speedier temporary files
+| Ifdef | Conditional config options
+| Index Color | Theming of the Index List
+| Initials Expando | Expando for Author's Initials
+| Keywords | Labels/Tagging for emails
+| Limit-Current-Thread | Limit Index View to Current Thread
+| LMDB | LMDB backend for the header cache
+| Multiple fcc | Save multiple copies of outgoing mail
+| Nested If | Allow deeply nested conditionals in format strings
+| New Mail Command | Run a command when new mail arrives
+| NNTP | Talk to a Usenet news server
+| Notmuch | Powerful email search engine
+| Progress Bar | Colourful Progress Bar
+| Quasi-Delete | Hide emails from view, but don't delete them
+| Sidebar | Panel containing list of Mailboxes
+| Skip-Quoted | Skip Quoted Text
+| SMIME Encrypt Self | Save an self-encrypted copy of emails
+| Status Color | Theming of the Status Bar
+| Timeout Hook | Run a command periodically
+| TLS-SNI | Negotiate with a Server for a Certificate
+| Trash Folder | Move 'deleted' emails to a trash folder
+
+## Contributed Scripts and Config
+
+- Keybase Integration
+ Joshua Jordi (JakkinStewart)
+- vim-keybindings - Mutt config for vim users
+ Ivan Tham (pickfire)
+
+## Where is NeoMutt?
+
+- Source Code: https://github.com/neomutt/neomutt
+- Releases: https://github.com/neomutt/neomutt/releases/latest
+- Questions/Bugs: https://github.com/neomutt/neomutt/issues
+- Website: http://www.neomutt.org/
+- IRC irc://irc.freenode.net/neomutt
+- Development: http://www.neomutt.org/devel/
+
+## NeoMutt Developers
+
+Here's a list of everyone who's helped NeoMutt:
+
+Alex Pearce, Ander Punnar, Antonio Radici, Chris Salzberg, Christoph Berg,
+Darshit Shah, David Sterba, Elimar Riesebieter, Evgeni Golov, Fabian Groffen,
+Fabio Alessandro Locati, Faidon Liambotis, Ivan Tham, Johannes Frankenau,
+Joshua Jordi, Karel Zak, Kurt Jaeger, Matteo Vescovi, Richard Hartmann,
+Richard Russon, Santiago Torres, Udo Schweigert, Werner Fink,
+Yoshiki Vázquez Baeza.
+
+## Original Patch Authors
+
+Without the original patch authors, there would be nothing.
+So, a Big Thank You to:
+
+Aaron Schrab, Alain Penders, Benjamin Kuperman, Cedric Duval, Chris Mason,
+Christian Aichinger, Christoph Berg, Christoph Rissner, David Champion,
+David Riebenbauer, David Sterba, David Wilson, Don Zickus, Elimar Riesebieter,
+Eric Davis, Evgeni Golov, Fabian Groffen, Felix von Leitner, Jan Synacek,
+Jason DeTiberus, Jeremiah Foster, Jeremy Katz, Josh Poimboeuf, Julius Plenz,
+Justin Hibbits, Karel Zak, Kirill Shutemov, Luke Macken, Mantas Mikulenas,
+Matteo Vescovi, Patrick Brisbin, Paul Miller, Phil Pennock,
+Philippe Le Brouster, Richard Russon, Rocco Rutte, Roland Rosenfeld, Sami Farin,
+Stefan Assmann, Stefan Kuhn, Steve Kemp, Terry Chan, Thomas Glanzmann,
+Thomer Gil, Tim Stoakes, Tyler Earnest, Victor Manuel Jaquez Leal,
+Vincent Lefevre, Vladimir Marek, Vsevolod Volkov.
+
+## Original Mutt Authors
+
+And of course, we should thank the original Mutt authors, including the original
+author Michael Elkins and all the people that have contributed to Mutt during
+its long history, see the Acknowledgements section of the user manual for a
+detailed list.
+
+http://www.neomutt.org/manual/miscellany.html#acknowledgements
+
diff --git a/VERSION.neo b/VERSION.neo
new file mode 100644
index 0000000..9fcb455
--- /dev/null
+++ b/VERSION.neo
@@ -0,0 +1 @@
+-neo
diff --git a/configure.ac b/configure.ac
index a97cfd8..935146c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,10 @@ dnl Process this file with autoconf to produce a configure script.
dnl !!! WHEN ADDING NEW CONFIGURE TESTS, PLEASE ADD CODE TO MAIN.C !!!
dnl !!! TO DUMP THEIR RESULTS WHEN MUTT -V IS CALLED !!!
-AC_INIT([mutt],[m4_esyscmd(tr -d \\n <VERSION)])
+CFLAGS=$CFLAGS
+LDFLAGS=$LDFLAGS
+
+AC_INIT([NeoMutt], m4_esyscmd(./git-version-gen --prefix "neomutt-" .tarball-version), [https://github.com/neomutt/neomutt/issues], [neomutt], [http://www.neomutt.org])
AC_CONFIG_SRCDIR(mutt.h)
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
@@ -29,6 +32,10 @@ AC_MSG_RESULT($mutt_cv_prefix)