patch to recognize file variables in the case of haskell pragmas, etc.

patch to recognize file variables in the case of haskell pragmas, etc.

[Ransom Williams]

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

tali713 in the #emacs channel on irc.freenode suggested i submit this
as a patch:

The regexps to pass over when looking for -*-file:variables-*-, namely
"^#!" and "^'\\\\\"", were previously hardcoded in the set-auto-mode-1
function.  They are now in the file-auto-mode-ignore list along with a
regular expression for haskell pragmas.

i am not on the list, but feel free to copy me on any comments that
need addressing.

[-- Attachment #2: PATCH.txt --]
[-- Type: text/plain, Size: 2635 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ransom@ugcs.caltech.edu-20120429215832-gz46s6sacd0i2qb6
# target_branch: file:///home/ransom/Code/bzr/emacs/trunk/
# testament_sha1: 3c93919614def2f05c63cb686c38a63386c49f4e
# timestamp: 2012-04-29 15:03:45 -0700
# base_revision_id: schwab@linux-m68k.org-20120429200544-\
#   rzfzg034jvr9f6le
# 
# Begin patch
=== modified file 'lisp/files.el'
--- lisp/files.el	2012-04-26 03:18:47 +0000
+++ lisp/files.el	2012-04-29 21:58:32 +0000
@@ -2781,6 +2781,9 @@
       (funcall mode)
       mode)))
 
+(setq file-auto-mode-ignore
+      (list "^#!" "^'\\\\\"" "^\{-#.*#-}$"))
+
 (defun set-auto-mode-1 ()
   "Find the -*- spec in the buffer.
 Call with point at the place to start searching from.
@@ -2803,7 +2806,7 @@
                             ;; interpreter invocation.  The same holds
                             ;; for '\" in man pages (preprocessor
                             ;; magic for the `man' program).
-                            (and (looking-at "^\\(#!\\|'\\\\\"\\)") 2)) t)
+                            (and (memq 't (mapcar 'looking-at file-auto-mode-ignore)) 2)) t)
      (progn
        (skip-chars-forward " \t")
        (setq beg (point))

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS1RUncAAah/gDAQAEB88//3
UgAABb////pQA66eAKAABkhU/Jqj0QeptMk9T1MaT1N5SNDT1HpHpHqHMABMAATAAAAAA5gAJgAC
YAAAAAEVP9UmIbRHqNGCYjTQyGIaZqMJoEkgJoBGgyJoaAE9I1HqAaMmrmlz1hy+DBSlEKFIEaxx
An0aKmObItuQlQ+o3zi+97FFJ4gQBIpxKp5AATOhIjhJXkgyDnOw36Rfj1smzAwLUA2VVgsVMrvk
zMzXO166h47y5ZURwdHditjRFIoNmeu1Qkp8tuNA/L9hwBghU8PBsyrH8d4w8z6mN22CW5JmEvJZ
dFZx79VuMFxGDH7OuQDn1bFBCe/Ba/anq4dBbIqtS0i/3FxneqmXX++ZPliq0w+FLEi52U1S9f0Q
wpfkLV2+/22K4fNOLcMq4yFLJeq3MIeIgoCjq+8qrXHzJZsQQaW423BZdWYYCpZnkYOqeKtWtBW2
mcyl6poYGMmWVoOVoh1Sctg0dn5FZNaEuF2pbCW+NeeioqOpUJ5hbAxWg81/K7FdEtMZueoP2Ueb
LP2VuOGDE9N9cC6CeLuE0I4uqysrDVwumqQMydy51VwKzZAtFfKmsjnPXaQw7qapja1qgsbYQWBi
IsmbWc17FlhVOPJO1wU7raNGtyk5NCdpVco1EQlRvY6/PbW2ROlfGE3aaiZXgIMFXcUCe/QWdOVQ
GncwaqlgaRTbiYPF7WZzhuRCVqV98eH+OA3y87kfmcW1u6MMefju3O5d7j6Ci6Fy85LMf7YLmjX4
lY7Lj0Adf5WC8ePJLl1qLh+PulIfcLGraelNxUtZ6+1FCS2wPcxoZGwnilJlz6eTOY4jQK21m2fO
HYeLqpB32RSbTklNT3tyzsT4Rb43aUW+XFuf3cen227MjwTLhnv6ufXuB9ZCoJJ/O+s1A9do87OB
mrT/fVcm+nw2/DlFeRvT9iZy80sBeV59BeKDQLLOuC1BpwPAWKxwt/CZ8tB5ogeX7QtY9+tcNccg
/HMJHC3CUMui3dE0W2BwJma4sEge4sY4i810ctS7N1czZ1afEUrsOpMlT37FJ/HAz4VUI3VOMKmk
fLGElEHsquN8GOakBREJuTC39pqrWA7jUcAHVB3SNpMrrDA6J69YK23yry2sy/OUCdN85xruXuKF
KNtXgmeFnbL0O0Z3lItfWhueBFQs8HrhU+6MQ6lNP6kmXgKphZ3KDd1Tiy0GroejbgI0Zpor8KjG
bm+pFu1KuQ6WrtrOooFatYiyuvF3JjyS+O7vrvKLHonK4O9fVROauWpYzWpaeYroqCxUvmf/i7ki
nChIFqipO4A=

Re: patch to recognize file variables in the case of haskell pragmas, etc.

[Ransom Williams]

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

uurk, typo/force of habit, sorry...

On Sun, Apr 29, 2012 at 3:25 PM, Ransom Williams <auvergnerw@gmail.com> wrote:
> tali713 in the #emacs channel on irc.freenode suggested i submit this
> as a patch:
>
> The regexps to pass over when looking for -*-file:variables-*-, namely
> "^#!" and "^'\\\\\"", were previously hardcoded in the set-auto-mode-1
> function.  They are now in the file-auto-mode-ignore list along with a
> regular expression for haskell pragmas.
>
> i am not on the list, but feel free to copy me on any comments that
> need addressing.

[-- Attachment #2: PATCH2.txt --]
[-- Type: text/plain, Size: 3059 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ransom@ugcs.caltech.edu-20120430003851-040ddqugj3fqgscg
# target_branch: file:///home/ransom/Code/bzr/emacs/trunk/
# testament_sha1: 096e8633989e1a79c5b7b68433b46fcae783b629
# timestamp: 2012-04-29 17:39:04 -0700
# base_revision_id: schwab@linux-m68k.org-20120429200544-\
#   rzfzg034jvr9f6le
# 
# Begin patch
=== modified file 'lisp/files.el'
--- lisp/files.el	2012-04-26 03:18:47 +0000
+++ lisp/files.el	2012-04-30 00:38:51 +0000
@@ -2781,6 +2781,9 @@
       (funcall mode)
       mode)))
 
+(setq file-auto-mode-ignore
+      (list "^#!" "^'\\\\\"" "^{-#.*#-}$"))
+
 (defun set-auto-mode-1 ()
   "Find the -*- spec in the buffer.
 Call with point at the place to start searching from.
@@ -2803,7 +2806,7 @@
                             ;; interpreter invocation.  The same holds
                             ;; for '\" in man pages (preprocessor
                             ;; magic for the `man' program).
-                            (and (looking-at "^\\(#!\\|'\\\\\"\\)") 2)) t)
+                            (and (memq 't (mapcar 'looking-at file-auto-mode-ignore)) 2)) t)
      (progn
        (skip-chars-forward " \t")
        (setq beg (point))

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSue92AAAxB/gDAQAEB88//3
UgAABb////pQBb7rax0AHXQJAGnCSmlPUmymnoaZTT0hkbJlPU8kaADQ0EpUPUYjT1MagNGg0aaA
BkNAAlNSaJhJtRjUeoNAxHo9RB6jZTEA5gAJgACYAAAAACSQJoGgRoBGQIekaoHpqYaT1OxEu3ae
ATgf7ie5xHHA71jmDm6E2rAN/OLc+hEfJM6IkfSMRNdC8rC++h8cZ6GcQJJF1o0jzAIYYNKODXJz
6vaP4LvxlllTgcfx+R+3ZaVsWsGjBK5qlUMTSvlIicgT5tXrHSU9ZWeAoosAniPMxXF5xInkhBQE
aeo7/NxKdlmo/iwbrDgX1NxAICGdORiKzIPP5eJwKxb1eVWne4s5ppoCCMQOFuWPmZ+mlM3OdEXM
GSzvHfQWIsUkoRs7zuVQqj0EwhVVNBbSZOHd5ZCMJC1eKKIUeKX25zKh4jpXLIU2RaLLqfs/iFni
ZCvEw8gYF+CEZOrbIrEsDQlAKgK48WxBbI2cbgllYpweKQVAtF09MUa7MZ2CI4reK4YEf8IAiIoi
Ja460rLYOCycxcBiKFjfpeUSu2llpfnmItlfvo9mxHCvhbEReKhW4iiRQ000IisLzNTuXA0qGPyL
GNblaRoKoTQFseJPGE1qcLUarCX6EWzRijMrr341QyCQ8YvrN84iryyKHDioq1wUGvLhDy8VsDRc
R5pT7i6iwkUCkpvgovcaWHAiFN2OGcCyz9lfoR0YLYGONNmNRbkMEVAR5iLHvlVW6DrSmV5WBftq
MCwVtRI3jt++gvK0vkF15XuwcbpmQhxm+yLiAnMOvwtr2YFKjM8y7YTGrVj4CndGIGBHJCi1rzK5
zn1jwowWkC4KXWVeCdmQFWWGBaNEtHIkOExAqMEpmCjMIpSrGH+4eJ8zaWDGgc6S6DeazJlbMMGF
phkkvtbjegRbQM8pMQ5Lr9YB257SAHQ2PJnt+lUd2tEe7pTnE1AhVcIJCQgaeDAjRhskEceSDs7b
nA4s259uh+qpi9DGBkShGi+VXeDjiRM2iZC8kHqR9iVo/Abb090gdPGjsLBE/bI+ezqLwOog6vVb
gfqfAgkPjaI1mXlthcSoWI2nfW0UDWsUd0hwvsNhcam4OIqzQQTYXb6nszmJDDTiXOVrP3alGNH2
nYlx9WGZxeSSuPPCoQNw8RBMU6Nx47LxQiSzcf6N/ItFHKo53uNev5Hh8/8b92oegmF05cTw8upw
SeWBCYEhPNOvJylBOGogLWbMJ2tCIMQmkD9LVSOLjeOKDNsgFhlE4oWMg450zPXcIJUD2E1mUtFc
IkhHIC+7rBaJcjmvoIyWRiXH6Ew+RzB5ySTwpuSuY+3VczMiaAfrzAkHMuMJEPoLZ2W77JiTG1Lm
TOAujASAeOC5g6IPdd3CzXkbiyo2nQ4/5iILzA6JhBXr4okP5GAb+JMrI3zHBhNpB92DAkEUnjKZ
ypBjsKQIrEQqcJkG7qZWCwHfTnWcgQ4rA9Co1Jq21LE+E9F0BXXHzsNNowwvvpAKjWzdOZK2gvgR
QXyFIuubcHqmelf2JHc7DOQw4Z3yJFH2CGPIyCKhb6vRzm+8iRS8FUn+AgYXqImwjkdhUURvNq2T
XF4CKJypMlWDEZMIRKBQaJTmwDhHsEYjxGCwkDiRn5FgeBWlYK5iLCvJUAPQTL2EHcDxPW2hYsfq
JwqAeq+FE8hXizWRULMXDXkIXWCqj6NE0zh/F3JFOFCQK573YA==

Re: patch to recognize file variables in the case of haskell pragmas, etc.

[Stefan Monnier]

>>>>> "Ransom" == Ransom Williams <auvergnerw@gmail.com> writes:

> uurk, typo/force of habit, sorry...

> On Sun, Apr 29, 2012 at 3:25 PM, Ransom Williams <auvergnerw@gmail.com> wrote:
>> tali713 in the #emacs channel on irc.freenode suggested i submit this
>> as a patch:
>> 
>> The regexps to pass over when looking for -*-file:variables-*-, namely
>> "^#!" and "^'\\\\\"", were previously hardcoded in the set-auto-mode-1
>> function.  They are now in the file-auto-mode-ignore list along with a
>> regular expression for haskell pragmas.
>> 
>> i am not on the list, but feel free to copy me on any comments that
>> need addressing.

Thank you for your contribution.  I installed the patch below instead:
it's not much more difficult to (concat foo "\\|bla") than it is to add
to a list.


        Stefan


=== modified file 'lisp/files.el'
--- lisp/files.el	2012-05-04 23:16:47 +0000
+++ lisp/files.el	2012-05-05 03:18:37 +0000
@@ -2782,6 +2782,11 @@
       (funcall mode)
       mode)))
 
+(defvar file-auto-mode-skip "^\\(#!\\|'\\\\\"\\)"
+  "Regexp of lines to skip when looking for file-local settings.
+If the first line matches this regular expression, then the -*-...-*- file-
+local settings will be consulted on the second line instead of the first."
+
 (defun set-auto-mode-1 ()
   "Find the -*- spec in the buffer.
 Call with point at the place to start searching from.
@@ -2804,7 +2809,7 @@
                             ;; interpreter invocation.  The same holds
                             ;; for '\" in man pages (preprocessor
                             ;; magic for the `man' program).
-                            (and (looking-at "^\\(#!\\|'\\\\\"\\)") 2)) t)
+                            (and (looking-at file-auto-mode-skip) 2)) t)
      (progn
        (skip-chars-forward " \t")
        (setq beg (point))