*** /export/home/steve/work/usr/webrev/src/cmd/mutt/patch.Muttrc-       Wed Jul 22 07:02:36 2009
--- patch.Muttrc        Wed Jul 22 04:47:18 2009

*** 1,26 ****
! *** mutt-1.5.18/doc/Muttrc.orig       Mon Sep 29 21:55:19 2008
! --- mutt-1.5.18/doc/Muttrc    Mon Sep 29 22:01:27 2008
  ***************
! *** 18,24 ****
    "call urlview to extract URLs out of a message"
    
    # Show documentation when pressing F1
  ! macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
    
    # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
    macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
! --- 18,24 ----
    "call urlview to extract URLs out of a message"
    
    # Show documentation when pressing F1
  ! macro generic,pager <F1> "<shell-escape> less /opt/sfw/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
    
    # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
    macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
  ***************
! *** 714,724 ****
    # filtered message is read from the standard output.
    # 
    # 
  ! # set dotlock_program="/usr/local/bin/mutt_dotlock"
    #
--- 1,26 ----
! *** mutt-1.5.20/doc/Muttrc.orig       Wed Jul 22 04:44:50 2009
! --- mutt-1.5.20/doc/Muttrc    Wed Jul 22 04:47:00 2009
  ***************
! *** 23,29 ****
    "call urlview to extract URLs out of a message"
    
    # Show documentation when pressing F1
  ! macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
    
    # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
    macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
! --- 23,29 ----
    "call urlview to extract URLs out of a message"
    
    # Show documentation when pressing F1
  ! macro generic,pager <F1> "<shell-escape> less /opt/sfw/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
    
    # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
    macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
  ***************
! *** 870,880 ****
    # filtered message is read from the standard output.
    # 
    # 
  ! # set dotlock_program="/usr/local/bin/mutt_dotlock"
    #

*** 27,38 ****
    # Name: dotlock_program
    # Type: path
  ! # Default: "/usr/local/bin/mutt_dotlock"
    # 
    # 
!   # Contains the path of the mutt_dotlock (8) binary to be used by
! --- 714,724 ----
    # filtered message is read from the standard output.
    # 
    # 
  ! # set dotlock_program="/opt/sfw/bin/mutt_dotlock"
    #
--- 27,38 ----
    # Name: dotlock_program
    # Type: path
  ! # Default: "/usr/local/bin/mutt_dotlock"
    # 
    # 
!   # Contains the path of the mutt_dotlock(8) binary to be used by
! --- 870,880 ----
    # filtered message is read from the standard output.
    # 
    # 
  ! # set dotlock_program="/opt/sfw/bin/mutt_dotlock"
    #

*** 39,78 ****
    # Name: dotlock_program
    # Type: path
  ! # Default: "/opt/sfw/bin/mutt_dotlock"
    # 
    # 
!   # Contains the path of the mutt_dotlock (8) binary to be used by
  ***************
! *** 1562,1568 ****
!   # See also: ``$to_chars''.
    # 
    # 
  ! # set ispell="ispell"
    #
    # Name: ispell
    # Type: path
! --- 1562,1568 ----
!   # See also: ``$to_chars''.
    # 
    # 
  ! # set ispell="/opt/sfw/bin/ispell"
    #
    # Name: ispell
    # Type: path
  ***************
! *** 4301,4307 ****
!   # instead of a raw socket. You may be able to use this to set up
!   # preauthenticated connections to your IMAP/POP3 server. Example:
    # 
- ! # tunnel="ssh -q mailhost.net /usr/local/libexec/imapd"
    # 
!   # NOTE: For this example to work you must be able to log in to the remote
!   # machine without having to enter a password.
! --- 4301,4307 ----
!   # instead of a raw socket. You may be able to use this to set up
!   # preauthenticated connections to your IMAP/POP3 server. Example:
    # 
! ! # tunnel="ssh -q mailhost.net /opt/sfw/libexec/imapd"
    # 
!   # NOTE: For this example to work you must be able to log in to the remote
!   # machine without having to enter a password.
--- 39,78 ----
    # Name: dotlock_program
    # Type: path
  ! # Default: "/opt/sfw/bin/mutt_dotlock"
    # 
    # 
!   # Contains the path of the mutt_dotlock(8) binary to be used by
  ***************
! *** 1835,1841 ****
!   # ``save-hook'', ``fcc-hook'' and ``fcc-save-hook'', too.
    # 
    # 
  ! # set ispell="ispell"
    #
    # Name: ispell
    # Type: path
! --- 1835,1841 ----
!   # ``save-hook'', ``fcc-hook'' and ``fcc-save-hook'', too.
    # 
    # 
  ! # set ispell="/opt/sfw/bin/ispell"
    #
    # Name: ispell
    # Type: path
  ***************
! *** 4517,4523 ****
!   # was sent to a mailing-list you subscribe to.
    # 
    # 
! ! # set tunnel=""
    #
!   # Name: tunnel
!   # Type: string
! --- 4517,4523 ----
!   # was sent to a mailing-list you subscribe to.
    # 
!   # 
! ! # set tunnel="ssh -q mailhost.net /opt/sfw/libexec/imapd"
!   #
!   # Name: tunnel
!   # Type: string