# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: address@hidden # target_branch: file:///home/ransom/Code/bzr/emacs/trunk/ # testament_sha1: 096e8633989e1a79c5b7b68433b46fcae783b629 # timestamp: 2012-04-29 17:39:04 -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-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==