Browse Source

follow the original Muttrc and use its F1 for showing the manual; brand with OpenPKG release in generated User-Agent headers

Ralf S. Engelschall 20 years ago
parent
commit
d07d9fe4a7
4 changed files with 14 additions and 8 deletions
  1. 3 0
      mutt/mutt.spec
  2. 4 4
      mutt/muttrc
  3. 3 0
      mutt15/mutt15.spec
  4. 4 4
      mutt15/muttrc

+ 3 - 0
mutt/mutt.spec

@@ -133,6 +133,9 @@ Conflicts:    mutt15
 %if "%{with_quote}" == "yes"
     %patch -p1 -P 3
 %endif
+    %{l_shtool} subst \
+        -e 's;\(Mutt/%%s\);\1 %{l_openpkg_release -F "OpenPKG/%%s"};' \
+        sendlib.c
 
 %build
     #   configure for particular platform

+ 4 - 4
mutt/muttrc

@@ -86,8 +86,8 @@ set print = no
 macro index \cxd set sort=date-sent
 macro index \cxt set sort=threads
 
-#   show documentation on <ESC>+'h'
-macro generic "\eh" "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
-macro index   "\eh" "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
-macro pager   "\eh" "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
+#   show documentation
+macro generic <f1> "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
+macro index   <f1> "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
+macro pager   <f1> "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
 

+ 3 - 0
mutt15/mutt15.spec

@@ -139,6 +139,9 @@ Provides:     mutt
 %if "%{with_sidebar}" == "yes"
     %patch -p1 -P 4
 %endif
+    %{l_shtool} subst \
+        -e 's;\(Mutt/%%s\);\1 %{l_openpkg_release -F "OpenPKG/%%s"};' \
+        sendlib.c
 
 %build
     #   configure for particular platform

+ 4 - 4
mutt15/muttrc

@@ -86,8 +86,8 @@ set print = no
 macro index \cxd set sort=date-sent
 macro index \cxt set sort=threads
 
-#   show documentation on <ESC>+'h'
-macro generic "\eh" "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
-macro index   "\eh" "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
-macro pager   "\eh" "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
+#   show documentation
+macro generic <f1> "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
+macro index   <f1> "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
+macro pager   <f1> "!`echo ${PAGER-more}` @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"