[groff] 01/02: Fix or make consistent editor variable settings.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit ada516f83b97011c09dc761d2f7373990eab344e
Author: G. Branden Robinson <address@hidden>
Date:   Sat Oct 28 17:32:30 2017 -0400

    Fix or make consistent editor variable settings.
    
    These files' editor settings were either no-ops or caused the editor to
    throw warnings on buffer load.
    
    Tested with GNU Emacs 24.5.1 and Vim 8.0.707.
    
    control/mom/momdoc/*.html:
      * Telling Vim the file encoding no longer seems to be necessary.
      * Forcing the "modified" flag off as a consequence of a transcoding in
        the buffer no longer seems necessary either; opening the Latin-1
        src/devices/grolbp/grolbp.1.man in a UTF-8 environment does not
        set it, for example.
    
    contrib/pdfmark/pdfmark.ms:
    contrib/pdfmark/pdfmark.tmac:
    contrib/pdfmark/spdf.tmac:
    tmac/pdf.tmac:
      * Move single-line "-*- nroff -*-" Emacs settings to multi-line
        settings at the end of the file.
    
    contrib/mom/om.tmac-u:
      * As above, plus:
      * The declared file encoding was incorrect; in
        3a4907891fe75d93857166344d525e7f1c9c791e, Peter Schaffter changed
        it from Latin-1 to UTF-8.
    
    src/devices/grolbp/grolbp.1.man:
      * Move Vim filetype setting to the end of the file and use the correct
        Vim variable name for this setting.
    
    tmac/pdf.tmac:
      * Stop mixing Vim modeline comments with other comment material.
---
 contrib/mom/momdoc/appendices.html         | 1 -
 contrib/mom/momdoc/color.html              | 1 -
 contrib/mom/momdoc/cover.html              | 1 -
 contrib/mom/momdoc/definitions.html        | 1 -
 contrib/mom/momdoc/docelement.html         | 1 -
 contrib/mom/momdoc/docprocessing.html      | 1 -
 contrib/mom/momdoc/goodies.html            | 1 -
 contrib/mom/momdoc/graphical.html          | 1 -
 contrib/mom/momdoc/headfootpage.html       | 1 -
 contrib/mom/momdoc/images.html             | 1 -
 contrib/mom/momdoc/inlines.html            | 1 -
 contrib/mom/momdoc/intro.html              | 1 -
 contrib/mom/momdoc/letters.html            | 1 -
 contrib/mom/momdoc/macrolist.html          | 1 -
 contrib/mom/momdoc/rectoverso.html         | 1 -
 contrib/mom/momdoc/refer.html              | 1 -
 contrib/mom/momdoc/reserved.html           | 1 -
 contrib/mom/momdoc/tables-of-contents.html | 2 --
 contrib/mom/momdoc/toc.html                | 2 --
 contrib/mom/momdoc/typesetting.html        | 1 -
 contrib/mom/momdoc/using.html              | 1 -
 contrib/mom/momdoc/version-2.html          | 1 -
 contrib/mom/om.tmac-u                      | 6 ++++--
 contrib/pdfmark/pdfmark.ms                 | 5 ++++-
 contrib/pdfmark/pdfmark.tmac               | 7 +++++--
 contrib/pdfmark/spdf.tmac                  | 8 +++++---
 src/devices/grolbp/grolbp.1.man            | 3 +--
 tmac/pdf.tmac                              | 9 +++++----
 28 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index 37e05ff..3d197ce 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -900,4 +900,3 @@ typeset with mom and groff.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
index 381517e..4af38e5 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -504,4 +504,3 @@ in the notes at the end of
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
index 9aea902..65c67f3 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -842,4 +842,3 @@ for example
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/definitions.html 
b/contrib/mom/momdoc/definitions.html
index 97bcf67..3ac3b28 100644
--- a/contrib/mom/momdoc/definitions.html
+++ b/contrib/mom/momdoc/definitions.html
@@ -992,4 +992,3 @@ or concept you&#8217;re not familiar with.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified:-->
diff --git a/contrib/mom/momdoc/docelement.html 
b/contrib/mom/momdoc/docelement.html
index 642e3ab..5c32883 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -6513,4 +6513,3 @@ remove them with
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/docprocessing.html 
b/contrib/mom/momdoc/docprocessing.html
index 54cf30d..9c4ff30 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -3976,4 +3976,3 @@ a document.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index 81154e8..63f95a1 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -1517,4 +1517,3 @@ and all subsequent superscripts would be raised by 3 
points.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/graphical.html 
b/contrib/mom/momdoc/graphical.html
index 8d29ba1..059e5ad 100644
--- a/contrib/mom/momdoc/graphical.html
+++ b/contrib/mom/momdoc/graphical.html
@@ -627,4 +627,3 @@ page, either horizontal or vertical.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/headfootpage.html 
b/contrib/mom/momdoc/headfootpage.html
index 2763fb1..c6ea468 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -2286,4 +2286,3 @@ enabled.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index f98c570..301d5bf 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -2891,4 +2891,3 @@ macro.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
index a46913e..1ea67d3 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -1082,4 +1082,3 @@ ligatures and letters unique to various European 
languages), consult
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html
index 11d20b9..03e1f0f 100644
--- a/contrib/mom/momdoc/intro.html
+++ b/contrib/mom/momdoc/intro.html
@@ -494,4 +494,3 @@ quote&#8217;s finished, you have to tell mom it&#8217;s 
done.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters.html
index a837c06..687c824 100644
--- a/contrib/mom/momdoc/letters.html
+++ b/contrib/mom/momdoc/letters.html
@@ -575,4 +575,3 @@ number at the bottom of multi-page letters, invoke
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/macrolist.html 
b/contrib/mom/momdoc/macrolist.html
index f36cf74..809f7b8 100644
--- a/contrib/mom/momdoc/macrolist.html
+++ b/contrib/mom/momdoc/macrolist.html
@@ -1447,4 +1447,3 @@ elsewhere in the documentation.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/rectoverso.html 
b/contrib/mom/momdoc/rectoverso.html
index 112e6ef..a2e3180 100644
--- a/contrib/mom/momdoc/rectoverso.html
+++ b/contrib/mom/momdoc/rectoverso.html
@@ -354,4 +354,3 @@ above.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html
index aa509e0..8d25629 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -2121,4 +2121,3 @@ title.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html
index 91df415..5ebe4c9 100644
--- a/contrib/mom/momdoc/reserved.html
+++ b/contrib/mom/momdoc/reserved.html
@@ -2740,4 +2740,3 @@ docelement control macros that end in _COLOR.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/tables-of-contents.html 
b/contrib/mom/momdoc/tables-of-contents.html
index 2f907e1..89cbea2 100644
--- a/contrib/mom/momdoc/tables-of-contents.html
+++ b/contrib/mom/momdoc/tables-of-contents.html
@@ -1172,5 +1172,3 @@ or invoked just before
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
-
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index a480895..5d4c0d4 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -454,5 +454,3 @@ FDL in the main directory of the groff source package.
 
 </body>
 </html>
-
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/typesetting.html 
b/contrib/mom/momdoc/typesetting.html
index 315def4..b5e455b 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -4928,4 +4928,3 @@ quits and clears the values for all indent styles at once.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.html
index ea179bd..8277a56 100644
--- a/contrib/mom/momdoc/using.html
+++ b/contrib/mom/momdoc/using.html
@@ -311,4 +311,3 @@ reflects whatever changes you save to the mom file.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/version-2.html 
b/contrib/mom/momdoc/version-2.html
index 7c566bf..94fe12f 100644
--- a/contrib/mom/momdoc/version-2.html
+++ b/contrib/mom/momdoc/version-2.html
@@ -440,4 +440,3 @@ desired.
 
 </body>
 </html>
-<!-- vim: fileencoding=utf-8: nomodified: -->
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index ef4ccb6..3db1ea9 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -1,4 +1,3 @@
-.\" -*- nroff -*-      om.tmac
 .ig
 Mom -- a typesetting/document-processing macro set for groff.
 
@@ -22766,4 +22765,7 @@ No room to start \\*[MN-pos] margin note #\\n[MN-curr] 
on page \\n[#P].
 .    \}
 .    el .nop \!.pdfmomclean \\$@
 ..
-\# vim: ft=groff: encoding=latin1: fileencoding=latin1: nomodified:
+\# Local Variables:
+\# mode: nroff
+\# End:
+\# vim: filetype=groff:
diff --git a/contrib/pdfmark/pdfmark.ms b/contrib/pdfmark/pdfmark.ms
index 154030e..0d9d7de 100644
--- a/contrib/pdfmark/pdfmark.ms
+++ b/contrib/pdfmark/pdfmark.ms
@@ -1,4 +1,3 @@
-.\" vim: ft=groff          -*- nroff -*-
 .ig
 pdfmark.ms
 
@@ -2562,3 +2561,7 @@ macro.
 .NH 3
 .XN -N import-map -- Deploying a Document Reference Map
 .TC
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: filetype=groff:
diff --git a/contrib/pdfmark/pdfmark.tmac b/contrib/pdfmark/pdfmark.tmac
index 0651f84..2a8c56a 100644
--- a/contrib/pdfmark/pdfmark.tmac
+++ b/contrib/pdfmark/pdfmark.tmac
@@ -1,4 +1,3 @@
-.\" -*- nroff -*-
 .ig
 
 pdfmark.tmac
@@ -1947,4 +1946,8 @@ inspiration has come from discussion on the groff mailing 
list
 .als pdf*href-W      pdf*href
 .ds  pdf*href-W.link /Action << /Subtype /URI /URI (\\\\*[pdf:href-D]) >>
 .\"
-.\" pdfmark.tmac: end of file / vim: ft=groff
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: filetype=groff:
+.\" pdfmark.tmac: end of file
diff --git a/contrib/pdfmark/spdf.tmac b/contrib/pdfmark/spdf.tmac
index 26e9a1a..abc1ea9 100644
--- a/contrib/pdfmark/spdf.tmac
+++ b/contrib/pdfmark/spdf.tmac
@@ -1,4 +1,3 @@
-.\" -*- nroff -*-
 .ig
 
 spdf.tmac
@@ -220,5 +219,8 @@ The content for this section is not yet available.
 .\" as an addendum to this macro.
 .
 .pdfhref I -PT address@hidden
-.\"
-.\" spdf.tmac: end of file: vim: ft=groff
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: filetype=groff:
+.\" spdf.tmac: end of file
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.1.man
index fd47a35..74891fe 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -1,7 +1,5 @@
 '\" t
 .\" The above line should force the use of tbl as a preprocessor
-.\" vim: set syntax=nroff :
-.\" The above line should set vim into nroff mode
 .TH GROLBP @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
 grolbp \- groff driver for Canon CAPSL printers (LBP-4 and LBP-8 \
@@ -448,3 +446,4 @@ Macros for use with
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
+.\" vim: set filetype=groff:
diff --git a/tmac/pdf.tmac b/tmac/pdf.tmac
index cae880a..85fc6ae 100644
--- a/tmac/pdf.tmac
+++ b/tmac/pdf.tmac
@@ -1,5 +1,3 @@
-.\" -*- nroff -*-
-.
 .ig
 
 pdf.tmac
@@ -801,5 +799,8 @@ am solely responsible for any bugs I may have introduced 
into this file.
 .de pdfswitchtopage
 .nop \!x X pdf: switchtopage \\$*
 ..
-.\"
-.\" pdf.tmac: end of file / vim: ft=groff
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: filetype=groff:
+.\" pdf.tmac: end of file