comparison lisp/files.el @ 90813:e6fdae9180d4

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 698-710) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 216) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
author Miles Bader <miles@gnu.org>
date Tue, 24 Apr 2007 21:56:25 +0000
parents 4ef881a120fe 850af384ea3c
children d7172f202ab8
comparison
equal deleted inserted replaced
90812:6137cc8ddf90 90813:e6fdae9180d4
2121 2121
2122 (defvar magic-mode-alist 2122 (defvar magic-mode-alist
2123 `((image-type-auto-detected-p . image-mode) 2123 `((image-type-auto-detected-p . image-mode)
2124 ;; The < comes before the groups (but the first) to reduce backtracking. 2124 ;; The < comes before the groups (but the first) to reduce backtracking.
2125 ;; TODO: UTF-16 <?xml may be preceded by a BOM 0xff 0xfe or 0xfe 0xff. 2125 ;; TODO: UTF-16 <?xml may be preceded by a BOM 0xff 0xfe or 0xfe 0xff.
2126 ;; We use [ \t\n] instead of `\\s ' to make regex overflow less likely. 2126 ;; We use [ \t\r\n] instead of `\\s ' to make regex overflow less likely.
2127 (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") 2127 (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
2128 (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\n]*<\\)"))) 2128 (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
2129 (concat "\\(?:<\\?xml[ \t\n]+[^>]*>\\)?[ \t\n]*<" 2129 (concat "\\(?:<\\?xml[ \t\r\n]+[^>]*>\\)?[ \t\r\n]*<"
2130 comment-re "*" 2130 comment-re "*"
2131 "\\(?:!DOCTYPE[ \t\n]+[^>]*>[ \t\n]*<[ \t\n]*" comment-re "*\\)?" 2131 "\\(?:!DOCTYPE[ \t\r\n]+[^>]*>[ \t\r\n]*<[ \t\r\n]*" comment-re "*\\)?"
2132 "[Hh][Tt][Mm][Ll]")) 2132 "[Hh][Tt][Mm][Ll]"))
2133 . html-mode) 2133 . html-mode)
2134 ("<!DOCTYPE[ \t\r\n]+[Hh][Tt][Mm][Ll]" . html-mode)
2134 ;; These two must come after html, because they are more general: 2135 ;; These two must come after html, because they are more general:
2135 ("<\\?xml " . xml-mode) 2136 ("<\\?xml " . xml-mode)
2136 (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") 2137 (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
2137 (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\n]*<\\)"))) 2138 (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
2138 (concat "[ \t\n]*<" comment-re "*!DOCTYPE ")) 2139 (concat "[ \t\r\n]*<" comment-re "*!DOCTYPE "))
2139 . sgml-mode) 2140 . sgml-mode)
2140 ("%!PS" . ps-mode) 2141 ("%!PS" . ps-mode)
2141 ("# xmcd " . conf-unix-mode)) 2142 ("# xmcd " . conf-unix-mode))
2142 "Alist of buffer beginnings vs. corresponding major mode functions. 2143 "Alist of buffer beginnings vs. corresponding major mode functions.
2143 Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION). 2144 Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION).
2432 ;; 2433 ;;
2433 ;; For variables defined in the C source code the declaration should go here: 2434 ;; For variables defined in the C source code the declaration should go here:
2434 2435
2435 (mapc (lambda (pair) 2436 (mapc (lambda (pair)
2436 (put (car pair) 'safe-local-variable (cdr pair))) 2437 (put (car pair) 'safe-local-variable (cdr pair)))
2437 '((buffer-read-only . booleanp) ;; C source code 2438 '((buffer-read-only . booleanp) ;; C source code
2438 (fill-column . integerp) ;; C source code 2439 (default-directory . stringp) ;; C source code
2439 (indent-tabs-mode . booleanp) ;; C source code 2440 (fill-column . integerp) ;; C source code
2440 (left-margin . integerp) ;; C source code 2441 (indent-tabs-mode . booleanp) ;; C source code
2441 (no-update-autoloads . booleanp) 2442 (left-margin . integerp) ;; C source code
2442 (tab-width . integerp) ;; C source code 2443 (no-update-autoloads . booleanp)
2443 (truncate-lines . booleanp))) ;; C source code 2444 (tab-width . integerp) ;; C source code
2445 (truncate-lines . booleanp))) ;; C source code
2444 2446
2445 (put 'c-set-style 'safe-local-eval-function t) 2447 (put 'c-set-style 'safe-local-eval-function t)
2446 2448
2447 (defun hack-local-variables-confirm (vars unsafe-vars risky-vars) 2449 (defun hack-local-variables-confirm (vars unsafe-vars risky-vars)
2448 (if noninteractive 2450 (if noninteractive