[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/files.el,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/files.el,v |
Date: |
Fri, 28 Dec 2007 22:26:15 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 07/12/28 22:26:14
Index: lisp/files.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/files.el,v
retrieving revision 1.953
retrieving revision 1.954
diff -u -b -r1.953 -r1.954
--- lisp/files.el 23 Dec 2007 17:37:14 -0000 1.953
+++ lisp/files.el 28 Dec 2007 22:26:06 -0000 1.954
@@ -525,7 +525,10 @@
:group 'view)
(defvar file-name-history nil
- "History list of file names entered in the minibuffer.")
+ "History list of file names entered in the minibuffer.
+
+Maximum length of the history list is determined by the value
+of `history-length', which see.")
(put 'ange-ftp-completion-hook-function 'safe-magic t)
(defun ange-ftp-completion-hook-function (op &rest args)
@@ -2092,7 +2095,7 @@
("java.+\\.conf\\'" . conf-javaprop-mode)
("\\.properties\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-javaprop-mode)
;; *.cf, *.cfg, *.conf, *.config[.local|.de_DE.UTF8|...], */config
- ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" .
conf-mode)
+ ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" .
conf-mode-maybe)
("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|pam\\.d/.*\\|permissions\\(?:\\.d/.+\\)?\\|protocols\\|rpc\\|services\\)\\'"
. conf-space-mode)
("\\`/etc/\\(?:acpid?/.+\\|aliases\\(?:\\.d/.+\\)?\\|default/.+\\|group-?\\|hosts\\..+\\|inittab\\|ksysguarddrc\\|opera6rc\\|passwd-?\\|shadow-?\\|sysconfig/.+\\)\\'"
. conf-mode)
;; ChangeLog.old etc. Other change-log-mode entries are above;
@@ -2139,6 +2142,16 @@
based on the interpreters they specify to run,
and `magic-mode-alist', which determines modes based on file contents.")
+(defun conf-mode-maybe ()
+ "Select Conf mode or XML mode according to start of file."
+ (if (save-excursion
+ (save-restriction
+ (widen)
+ (goto-char (point-min))
+ (looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE ")))
+ (xml-mode)
+ (conf-mode)))
+
(defvar interpreter-mode-alist
;; Note: The entries for the modes defined in cc-mode.el (awk-mode
;; and pike-mode) are added through autoload directives in that
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, D. Goel, 2007/12/05
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Vinicius Jose Latorre, 2007/12/10
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Vinicius Jose Latorre, 2007/12/11
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Vinicius Jose Latorre, 2007/12/12
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Vinicius Jose Latorre, 2007/12/12
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Miles Bader, 2007/12/16
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Michael Albinus, 2007/12/18
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Andreas Schwab, 2007/12/23
- [Emacs-diffs] Changes to emacs/lisp/files.el,v, Juri Linkov, 2007/12/23
- [Emacs-diffs] Changes to emacs/lisp/files.el,v,
Miles Bader <=