# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: address@hidden # target_branch: file:///home/ransom/Code/bzr/emacs/trunk/ # testament_sha1: 3c93919614def2f05c63cb686c38a63386c49f4e # timestamp: 2012-04-29 15:03:45 -0700 # base_revision_id: address@hidden # 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=