comparison lisp/files.el @ 404:2f8bb876ab1d r21-2-32

Import from CVS: tag r21-2-32
author cvs
date Mon, 13 Aug 2007 11:16:07 +0200
parents a86b2b5e0111
children 501cfd01ee6d
comparison
equal deleted inserted replaced
403:9f011ab08d48 404:2f8bb876ab1d
1026 nil 1026 nil
1027 (after-find-file error (not nowarn)) 1027 (after-find-file error (not nowarn))
1028 (setq buf (current-buffer)))) 1028 (setq buf (current-buffer))))
1029 (t 1029 (t
1030 (kill-buffer buf) 1030 (kill-buffer buf)
1031 (signal (car data) (cdr data)))))) 1031 (signal (car data) (cdr data))))
1032 ))
1032 buf))) 1033 buf)))
1033 1034
1034 ;; FSF has `insert-file-literally' and `find-file-literally' here. 1035 ;; FSF has `insert-file-literally' and `find-file-literally' here.
1035 1036
1036 (defvar after-find-file-from-revert-buffer nil) 1037 (defvar after-find-file-from-revert-buffer nil)
1191 ("^/tmp/fol/" . text-mode) 1192 ("^/tmp/fol/" . text-mode)
1192 ("\\.y\\'" . c-mode) 1193 ("\\.y\\'" . c-mode)
1193 ("\\.lex\\'" . c-mode) 1194 ("\\.lex\\'" . c-mode)
1194 ("\\.m\\'" . objc-mode) 1195 ("\\.m\\'" . objc-mode)
1195 ("\\.oak\\'" . scheme-mode) 1196 ("\\.oak\\'" . scheme-mode)
1196 ("\\.s?html?\\'" . html-mode) 1197 ("\\.[sj]?html?\\'" . html-mode)
1198 ("\\.jsp\\'" . html-mode)
1199 ("\\.xml\\'" . xml-mode)
1197 ("\\.htm?l?3\\'" . html3-mode) 1200 ("\\.htm?l?3\\'" . html3-mode)
1198 ("\\.\\(?:sgml?\\|dtd\\)\\'" . sgml-mode) 1201 ("\\.\\(?:sgml?\\|dtd\\)\\'" . sgml-mode)
1199 ("\\.c?ps\\'" . postscript-mode) 1202 ("\\.c?ps\\'" . postscript-mode)
1200 ;; .emacs following a directory delimiter in either Unix or 1203 ;; .emacs following a directory delimiter in either Unix or
1201 ;; Windows syntax. 1204 ;; Windows syntax.
2457 (lambda (ignore) 2460 (lambda (ignore)
2458 (exit-recursive-edit))) 2461 (exit-recursive-edit)))
2459 (recursive-edit) 2462 (recursive-edit)
2460 ;; Return nil to ask about BUF again. 2463 ;; Return nil to ask about BUF again.
2461 nil) 2464 nil)
2462 "display the current buffer")))) 2465 "%_Display Buffer"))))
2463 (abbrevs-done 2466 (abbrevs-done
2464 (and save-abbrevs abbrevs-changed 2467 (and save-abbrevs abbrevs-changed
2465 (progn 2468 (progn
2466 (if (or arg 2469 (if (or arg
2467 (y-or-n-p (format "Save abbrevs in %s? " abbrev-file-name))) 2470 (y-or-n-p (format "Save abbrevs in %s? " abbrev-file-name)))