]> granicus.if.org Git - neomutt/commitdiff
remove references to synonyms
authorRichard Russon <rich@flatcap.org>
Mon, 5 Jun 2017 23:37:33 +0000 (00:37 +0100)
committerRichard Russon <rich@flatcap.org>
Sat, 10 Jun 2017 14:24:11 +0000 (15:24 +0100)
Undocumented           | Real variable
-----------------------|-------------------------
edit_hdrs              | edit_headers
envelope_from          | use_envelope_from
forw_decode            | forward_decode
forw_decrypt           | forward_decrypt
forw_format            | forward_format
forw_quote             | forward_quote
hdr_format             | index_format
indent_str             | indent_string
mime_fwd               | mime_forward
msg_format             | message_format
pgp_autoencrypt        | crypt_autoencrypt
pgp_autosign           | crypt_autosign
pgp_auto_traditional   | pgp_replyinline
pgp_create_traditional | pgp_autoinline
pgp_replyencrypt       | crypt_replyencrypt
pgp_replysign          | crypt_replysign
pgp_replysignencrypted | crypt_replysignencrypted
pgp_verify_sig         | crypt_verify_sig
post_indent_str        | post_indent_string
print_cmd              | print_command
smime_sign_as          | smime_default_key
xterm_icon             | ts_icon_format
xterm_set_titles       | ts_enabled
xterm_title            | ts_status_format

UPDATING
contrib/Pine.rc
contrib/sample.muttrc
contrib/sample.muttrc-tlr
copy.c
doc/PGP-Notes.txt
doc/mutt-1.7.0-syntax.vim
doc/neomutt-syntax.vim
doc/smime-notes.txt
sendlib.c

index dd7ca69c3fdd94d01e707fdf8758645076e5cc2f..38bacb817f87bd52f1be0cb00fcba3403c1aea79 100644 (file)
--- a/UPDATING
+++ b/UPDATING
@@ -295,8 +295,7 @@ The keys used are:
 
 1.5.11 (2005-09-15):
 
-  ! $envelope_from_address has been added, $envelope_from has been renamed
-    to $use_envelope_from
+  ! $envelope_from_address has been added
   + Progress bar via $net_inc
   + IMAP server-side simple string search
   + Simple string matches instead of full regex matches for '=' instead
@@ -373,9 +372,8 @@ Mutt 1.5.7 (2005-01-28):
 
   + IDNA support
   + $bounce
-  ! $crypt_replyencrypt and $pgp_replyencrypt now default
-    to "yes" instead of "no"
-  + $pgp_auto_traditional
+  ! $crypt_replyencrypt now defaults to "yes" instead of "no"
+  + $pgp_replyinline
   + %A for $index_format
 
 1.5.3 (2002-12-17):
index 0295aee09fd86fe03ba2090814667c98c3f678bd..8132c9929bd5dc59c1e7fecd2318d595b41605ca 100644 (file)
@@ -37,4 +37,4 @@ set folder=~/mail
 set record=+sent-mail
 set nosave_name
 set postponed=~/postponed-msgs
-set hdr_format="%Z %3C %{%b %d} %-19.19L (%5c) %s"
+set index_format="%Z %3C %{%b %d} %-19.19L (%5c) %s"
index 0a8f2f849f4080016c5d1d7d6a55169a71c7578d..c0675f7d0790613e58e57eee945b4ed90d3ff9d0 100644 (file)
@@ -103,7 +103,7 @@ set tilde                   # virtual lines to pad blank lines in the pager
 set nouse_domain               # don't qualify local addresses with $domain
 #set use_from                  # always generate the `From:' header field
 set implicit_autoview=yes      # pager shows parts having a mailcap viewer
-set pgp_verify_sig=no          # don't automatically verify message signatures
+set crypt_verify_sig=no                # don't automatically verify message signatures
 #set visual=vim                        # editor invoked by ~v in the builtin editor
 #set nowait_key                        # prompt when a pipe returns normal status
 set write_inc=25               # show progress while writing mailboxes
index 43b9b3b225a9af3eacf31dd98b0c1fda82e762a1..d3eff866fb2c0c44da784b8ef52c0efc5059e384 100644 (file)
@@ -202,7 +202,7 @@ set   confirmcreate                 # Ask me about creating new files
 unset confirmappend                    # Don't ask me about appending to files
 set   delete=yes                       # Don't ask me whether or not I meant to delete messages
 # set   display_filter="tr '\240\204\223\226' ' \"\"-'" # fix some funny characters
-set   edit_hdrs                                # I want to edit the headers.
+set   edit_headers                     # I want to edit the headers.
 set   editor="/usr/bin/jed %s -f 'mail_mode();'"
                                        # Invoke jed with mail_mode.  This may
                                        # or may not work for you.
@@ -218,20 +218,20 @@ set   include=yes                 # Always include a copy when replying.
 set   mark_old                 # Distinguish between seen (but unread) and new messages
 set   mbox=+mbox                       # The (unused) mbox file.
 unset metoo                            # Remove me from CC headers.
-set   mime_fwd=ask-no                  # Ask me whether or not to create a MIME-encapsulated forward
+set   mime_forward_rest=ask-no         # Ask me whether or not to create a MIME-encapsulated forward
 set   move=no                          # Don't use mbox
 set   pager_stop                       # Don't fall through to the next message in the pager
 set   pager_index_lines=0              # The pager index is ugly.
-set   pgp_replyencrypt                 # Encrypt when replying to encrypted messages.
-set   pgp_replysignencrypted           # Sign when replying to encrypted messages.
+set   crypt_replyencrypt               # Encrypt when replying to encrypted messages.
+set   crypt_replysignencrypted         # Sign when replying to encrypted messages.
 set   pgp_show_unusable="no"           # Don't display unusable keys.
 set   pgp_sort_keys="keyid"            # Sort keys by key ID
-set   pgp_replysign                    # Sign when replying to signed messages.
+set   crypt_replysign                  # Sign when replying to signed messages.
 set   pgp_timeout=3600                 # Forget the PGP passphrase after an hour.
 set   pipe_decode                      # Decode messages I pipe to commands, typically to patch(1).
 set   postponed=~/.mutt/postponed      # Where to put postponed messages
 set   print=ask-no                     # Don't waste paper
-set   print_cmd="enscript -2Gr -Email" # Two columns, landscape, fancy header.
+set   print_command="enscript -2Gr -Email"     # Two columns, landscape, fancy header.
 set   print_split=yes                  # Invoke enscript once per message
 set   quit=yes                         # Don't ask me whether or not I want to quit.
 set   quote_regexp="^ *[a-zA-Z]*[>|][>:|]*"    # Recognize quotes in the pager.
@@ -264,7 +264,7 @@ set   query_command="lbdb2q.pl %s"          # Use the Little Brother's Database with the
 set   sendmail_wait=-1                 # Don't put sendmail into the background.
 set   encode_from                      # "From " in the beginning of a line triggers quoted-printable
 set   nowait_key                       # Return immediately from external programs
-set   forw_format="[fwd] %s (from: %a)"        # A different subject for forwarded messages
+set   forward_format="[fwd] %s (from: %a)"     # A different subject for forwarded messages
 set   nobeep                           # Shut up. ;-)
 set   reply_regexp="^((re([\\[0-9\\]+])*|aw):[ \t]*)+[ \t]*"   # A regular expression to detect replies
 set   header                           # Include the message header when replying.
diff --git a/copy.c b/copy.c
index 7717362db825a541f0027d84176875689fc50875..1261996db198b686609c23e72d7902c911e70502 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -340,7 +340,7 @@ int mutt_copy_hdr(FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end,
         CH_NOLEN        don't write Content-Length: and Lines:
         CH_NONEWLINE    don't output a newline after the header
         CH_NOSTATUS     ignore the Status: and X-Status:
-        CH_PREFIX       quote header with $indent_str
+        CH_PREFIX       quote header with $indent_string
         CH_REORDER      output header in order specified by `hdr_order'
         CH_TXTPLAIN     generate text/plain MIME headers [hack alert.]
         CH_UPDATE       write new Status: and X-Status:
index 02762497b5d828d907975849d846848011063d6e..43be2d289b618372dc38800a2dd5fca647b7bdf1 100644 (file)
@@ -111,7 +111,7 @@ The old answer to this question used to be this:
        x-action=sign\n"
 
 
-There's a new answer, though: Set the $pgp_create_traditional
+There's a new answer, though: Set the $pgp_autoinline
 configuration variable (it's a quad-option) to something different
 from "no" (that's the default).  Mutt will then try to use
 application/pgp wherever it makes sense.  In particular, it does
index 7844ad816f8e68dcafb195e4d86fe474d6121b24..63bbeb2ff828b18abc4f8887256aeacc3d01ac9b 100644 (file)
@@ -108,9 +108,9 @@ syn keyword muttrcVarBool   skipwhite contained
                        \ crypt_autoencrypt crypt_autopgp crypt_autosign crypt_autosmime
                        \ crypt_confirmhook crypt_opportunistic_encrypt crypt_replyencrypt
                        \ crypt_replysign crypt_replysignencrypted crypt_timestamp crypt_use_gpgme
-                       \ crypt_use_pka delete_untag digest_collapse duplicate_threads edit_hdrs
-                       \ edit_headers encode_from envelope_from fast_reply fcc_clear followup_to
-                       \ force_name forw_decode forw_decrypt forw_quote forward_decode forward_decrypt
+                       \ crypt_use_pka delete_untag digest_collapse duplicate_threads
+                       \ edit_headers encode_from fast_reply fcc_clear followup_to
+                       \ force_name forward_decode forward_decrypt
                        \ forward_quote hdrs header help hidden_host hide_limited hide_missing
                        \ hide_thread_subject hide_top_limited hide_top_missing honor_disposition
                        \ idn_decode idn_encode ignore_linear_white_space ignore_list_reply_to
@@ -119,10 +119,10 @@ syn keyword muttrcVarBool skipwhite contained
                        \ mail_check_recent mail_check_stats mailcap_sanitize maildir_check_cur
                        \ maildir_header_cache_verify maildir_trash mark_old markers menu_move_off
                        \ menu_scroll message_cache_clean meta_key metoo mh_purge mime_forward_decode
-                       \ narrow_tree pager_stop pgp_auto_decode pgp_auto_traditional pgp_autoencrypt
-                       \ pgp_autoinline pgp_autosign pgp_check_exit pgp_create_traditional
-                       \ pgp_ignore_subkeys pgp_long_ids pgp_replyencrypt pgp_replyinline pgp_replysign
-                       \ pgp_replysignencrypted pgp_retainable_sigs pgp_show_unusable pgp_strict_enc
+                       \ narrow_tree pager_stop pgp_auto_decode
+                       \ pgp_autoinline pgp_check_exit
+                       \ pgp_ignore_subkeys pgp_long_ids pgp_replyinline
+                       \ pgp_retainable_sigs pgp_show_unusable pgp_strict_enc
                        \ pgp_use_gpg_agent pipe_decode pipe_split pop_auth_try_all pop_last
                        \ postpone_encrypt postpone_encrypt_as print_decode print_split prompt_after
                        \ read_only reflow_space_quotes reflow_text reflow_wrap reply_self resolve
@@ -215,7 +215,7 @@ syn keyword muttrcVarBool   skipwhite contained
 syn keyword muttrcVarQuad      skipwhite contained
                        \ abort_nosubject abort_unmodified bounce copy crypt_verify_sig delete
                        \ fcc_attach forward_edit honor_followup_to include mime_forward
-                       \ mime_forward_rest mime_fwd move pgp_mime_auto pgp_verify_sig pop_delete
+                       \ mime_forward_rest move pgp_mime_auto pop_delete
                        \ pop_reconnect postpone print quit recall reply_to ssl_starttls
                        \ nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
@@ -360,29 +360,28 @@ syn keyword muttrcVarStr  contained skipwhite
                        \ alias_file assumed_charset attach_charset attach_sep certificate_file charset
                        \ config_charset content_type default_hook display_filter dotlock_program
                        \ dsn_notify dsn_return editor entropy_file envelope_from_address escape folder
-                       \ forw_format forward_format from gecos_mask hdr_format header_cache
+                       \ forward_format from gecos_mask header_cache
                        \ header_cache_compress header_cache_pagesize history_file hostname
                        \ imap_authenticators imap_delim_chars imap_headers imap_idle imap_login
-                       \ imap_pass imap_user indent_str indent_string ispell locale mailcap_path mask
+                       \ imap_pass imap_user indent_string ispell locale mailcap_path mask
                        \ mbox mbox_type message_cachedir mh_seq_flagged mh_seq_replied mh_seq_unseen
-                       \ mixmaster msg_format pager pgp_decryption_okay pgp_good_sign
+                       \ mixmaster pager pgp_decryption_okay pgp_good_sign
                        \ pgp_mime_signature_description pgp_mime_signature_filename pgp_sign_as
                        \ pgp_sort_keys pipe_sep pop_authenticators pop_host pop_pass pop_user
-                       \ post_indent_str post_indent_string postpone_encrypt_as postponed preconnect
-                       \ print_cmd print_command query_command quote_regexp realname record
+                       \ post_indent_string postpone_encrypt_as postponed preconnect
+                       \ print_command query_command quote_regexp realname record
                        \ reply_regexp send_charset sendmail shell sidebar_delim sidebar_delim_chars
                        \ sidebar_divider_char sidebar_format sidebar_indent_string sidebar_sort_method
                        \ signature simple_search smileys smime_ca_location smime_certificates
-                       \ smime_default_key smime_encrypt_with smime_keys smime_sign_as
+                       \ smime_default_key smime_encrypt_with smime_keys
                        \ smime_sign_digest_alg smtp_authenticators smtp_pass smtp_url sort sort_alias
                        \ sort_aux sort_browser spam_separator spoolfile ssl_ca_certificates_file
                        \ ssl_ciphers ssl_client_cert status_chars tmpdir to_chars trash ts_icon_format
                        \ ts_status_format tunnel visual
                        \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
-" Present in 1.4.2.1 (pgp_create_traditional was a bool then)
 syn keyword muttrcVarBool      contained skipwhite imap_force_ssl noimap_force_ssl invimap_force_ssl nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-"syn keyword muttrcVarQuad     contained pgp_create_traditional nopgp_create_traditional invpgp_create_traditional
+"syn keyword muttrcVarQuad     contained nopgp_create_traditional invpgp_create_traditional
 syn keyword muttrcVarStr       contained skipwhite alternates nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 syn keyword muttrcMenu         contained alias attach browser compose editor index pager postpone pgp mix query generic
index 66cc38ec9f91d35f3a1aea36eab05f1a14f8de2c..3844b1c48a945b6ab69c0d88940819bca3a85432 100644 (file)
@@ -108,9 +108,9 @@ syn keyword muttrcVarBool   skipwhite contained
                        \ crypt_autoencrypt crypt_autopgp crypt_autosign crypt_autosmime
                        \ crypt_confirmhook crypt_opportunistic_encrypt crypt_replyencrypt
                        \ crypt_replysign crypt_replysignencrypted crypt_timestamp crypt_use_gpgme
-                       \ crypt_use_pka delete_untag digest_collapse duplicate_threads edit_hdrs
-                       \ edit_headers encode_from envelope_from fast_reply fcc_clear followup_to
-                       \ force_name forw_decode forw_decrypt forw_quote forward_decode forward_decrypt
+                       \ crypt_use_pka delete_untag digest_collapse duplicate_threads
+                       \ edit_headers encode_from fast_reply fcc_clear followup_to
+                       \ force_name forward_decode forward_decrypt
                        \ forward_quote hdrs header help hidden_host hide_limited hide_missing
                        \ hide_thread_subject hide_top_limited hide_top_missing honor_disposition
                        \ idn_decode idn_encode ignore_linear_white_space ignore_list_reply_to
@@ -119,10 +119,10 @@ syn keyword muttrcVarBool skipwhite contained
                        \ mail_check_recent mail_check_stats mailcap_sanitize maildir_check_cur
                        \ maildir_header_cache_verify maildir_trash mark_old markers menu_move_off
                        \ menu_scroll message_cache_clean meta_key metoo mh_purge mime_forward_decode
-                       \ narrow_tree pager_stop pgp_auto_decode pgp_auto_traditional pgp_autoencrypt
-                       \ pgp_autoinline pgp_autosign pgp_check_exit pgp_create_traditional
-                       \ pgp_ignore_subkeys pgp_long_ids pgp_replyencrypt pgp_replyinline pgp_replysign
-                       \ pgp_replysignencrypted pgp_retainable_sigs pgp_show_unusable pgp_strict_enc
+                       \ narrow_tree pager_stop pgp_auto_decode
+                       \ pgp_autoinline pgp_check_exit
+                       \ pgp_ignore_subkeys pgp_long_ids pgp_replyinline
+                       \ pgp_retainable_sigs pgp_show_unusable pgp_strict_enc
                        \ pgp_use_gpg_agent pipe_decode pipe_split pop_auth_try_all pop_last
                        \ postpone_encrypt postpone_encrypt_as print_decode print_split prompt_after
                        \ read_only reflow_space_quotes reflow_text reflow_wrap reply_self resolve
@@ -215,7 +215,7 @@ syn keyword muttrcVarBool   skipwhite contained
 syn keyword muttrcVarQuad      skipwhite contained
                        \ abort_nosubject abort_unmodified bounce copy crypt_verify_sig delete
                        \ fcc_attach forward_edit honor_followup_to include mime_forward
-                       \ mime_forward_rest mime_fwd move pgp_mime_auto pgp_verify_sig pop_delete
+                       \ mime_forward_rest move pgp_mime_auto pop_delete
                        \ pop_reconnect postpone print quit recall reply_to ssl_starttls
                        \ nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
@@ -360,29 +360,28 @@ syn keyword muttrcVarStr  contained skipwhite
                        \ alias_file assumed_charset attach_charset attach_sep certificate_file charset
                        \ config_charset content_type default_hook display_filter dotlock_program
                        \ dsn_notify dsn_return editor entropy_file envelope_from_address escape folder
-                       \ forw_format forward_format from gecos_mask hdr_format header_cache
+                       \ forward_format from gecos_mask header_cache
                        \ header_cache_compress header_cache_pagesize history_file hostname
                        \ imap_authenticators imap_delim_chars imap_headers imap_idle imap_login
-                       \ imap_pass imap_user indent_str indent_string ispell locale mailcap_path mask
+                       \ imap_pass imap_user indent_string ispell locale mailcap_path mask
                        \ mbox mbox_type message_cachedir mh_seq_flagged mh_seq_replied mh_seq_unseen
-                       \ mixmaster msg_format pager pgp_decryption_okay pgp_good_sign
+                       \ mixmaster pager pgp_decryption_okay pgp_good_sign
                        \ pgp_mime_signature_description pgp_mime_signature_filename pgp_sign_as
                        \ pgp_sort_keys pipe_sep pop_authenticators pop_host pop_pass pop_user
-                       \ post_indent_str post_indent_string postpone_encrypt_as postponed preconnect
-                       \ print_cmd print_command query_command quote_regexp realname record
+                       \ post_indent_string postpone_encrypt_as postponed preconnect
+                       \ print_command query_command quote_regexp realname record
                        \ reply_regexp send_charset sendmail shell sidebar_delim sidebar_delim_chars
                        \ sidebar_divider_char sidebar_format sidebar_indent_string sidebar_sort_method
                        \ signature simple_search smileys smime_ca_location smime_certificates
-                       \ smime_default_key smime_encrypt_with smime_keys smime_sign_as
+                       \ smime_default_key smime_encrypt_with smime_keys
                        \ smime_sign_digest_alg smtp_authenticators smtp_pass smtp_url sort sort_alias
                        \ sort_aux sort_browser spam_separator spoolfile ssl_ca_certificates_file
                        \ ssl_ciphers ssl_client_cert status_chars tmpdir to_chars trash ts_icon_format
                        \ ts_status_format tunnel visual
                        \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
-" Present in 1.4.2.1 (pgp_create_traditional was a bool then)
 syn keyword muttrcVarBool      contained skipwhite imap_force_ssl noimap_force_ssl invimap_force_ssl nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-"syn keyword muttrcVarQuad     contained pgp_create_traditional nopgp_create_traditional invpgp_create_traditional
+"syn keyword muttrcVarQuad     contained nopgp_create_traditional invpgp_create_traditional
 syn keyword muttrcVarStr       contained skipwhite alternates nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 syn keyword muttrcMenu         contained alias attach browser compose editor index pager postpone pgp mix query generic
index a1b444013b1ea331485b8b280d901828a1f5089b..c355f87e57c713d1d133504bc6b8bb7e31985044 100644 (file)
@@ -1,7 +1,7 @@
 How to use mutt's S/MIME capabilities
 
 - Add the contents of contrib/smime.rc to your .muttrc. Don't worry about
-  changing the smime_sign_as line at this point -- you'll change it later.
+  changing the smime_default_key line at this point -- you'll change it later.
 
 - Run 'smime_keys init'.
 
@@ -35,7 +35,7 @@ How to use mutt's S/MIME capabilities
       The number (including the ".0" at the end) is your keyid. You will
       need this number in the next step.
 
-- Edit the smime_sign_as line in your muttrc, replacing the keyid with your
+- Edit the smime_default_key line in your muttrc, replacing the keyid with your
   own.
 
 - You probably want to import trusted root certificates from Mozilla or
index 8a193cf5076b32909bc6a46524f8e167ab80eae9..9fc23fad608df200543cc8a71475daa254ff9689 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1927,7 +1927,7 @@ out:
  *
  * Likewise, all IDN processing should happen outside of this routine.
  *
- * mode == 1  => "lite" mode (used for edit_hdrs)
+ * mode == 1  => "lite" mode (used for edit_headers)
  * mode == 0  => normal mode.  write full header + MIME headers
  * mode == -1 => write just the envelope info (used for postponing messages)
  *