[Emacs-diffs] Changes to emacs/lisp/files.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.666.2.11 emacs/lisp/files.el:1.666.2.12
*** emacs/lisp/files.el:1.666.2.11      Fri Nov 12 02:52:52 2004
--- emacs/lisp/files.el Fri Nov 19 06:55:07 2004
***************
*** 478,484 ****
        (apply op args))))
  
  (defun convert-standard-filename (filename)
!   "Convert a standard file's name to something suitable for the current OS.
  This means to guarantee valid names and perhaps to canonicalize
  certain patterns.
  
--- 478,484 ----
        (apply op args))))
  
  (defun convert-standard-filename (filename)
!   "Convert a standard file's name to something suitable for the OS.
  This means to guarantee valid names and perhaps to canonicalize
  certain patterns.
  
***************
*** 487,493 ****
  characters.  On DOS, make sure to obey the 8.3 limitations.  On
  Windows, turn Cygwin names into native names, and also turn
  slashes into backslashes if the shell requires it (see
! `w32-shell-dos-semantics')."
    filename)
  
  (defun read-directory-name (prompt &optional dir default-dirname mustmatch 
initial)
--- 487,495 ----
  characters.  On DOS, make sure to obey the 8.3 limitations.  On
  Windows, turn Cygwin names into native names, and also turn
  slashes into backslashes if the shell requires it (see
! `w32-shell-dos-semantics').
! 
! See Info node `(elisp)Standard File Names' for more details."
    filename)
  
  (defun read-directory-name (prompt &optional dir default-dirname mustmatch 
initial)
***************
*** 1763,1774 ****
       ("\\.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)
!      
("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|permissions\\|protocols\\|rpc\\|services\\)\\'"
 . conf-space-mode)
!      ("\\`/etc/\\(?:aliases\\|hosts\\..+\\|ksysguarddrc\\|opera6rc\\)\\'" . 
conf-mode)
       ;; either user's dot-files or under /etc or some such
       ("/\\.?\\(?:gnokiirc\\|kde.*rc\\|mime\\.types\\|wgetrc\\)\\'" . 
conf-mode)
       ;; alas not all ~/.*rc files are like this
!      
("/\\.\\(?:enigma\\|gltron\\|hxplayer\\|net\\|neverball\\|qt/.+\\|realplayer\\|scummvm\\|sversion\\|sylpheed/.+\\|xmp\\)rc\\'"
 . conf-mode)
       
("/\\.\\(?:gdbtkinit\\|grip\\|orbital/.+txt\\|rhosts\\|tuxracer/options\\)\\'" 
. conf-mode)
       ("/\\.?X\\(?:default\\|resource\\|re\\)s\\>" . conf-xdefaults-mode)
       ("/X11.+app-defaults/" . conf-xdefaults-mode)
--- 1765,1776 ----
       ("\\.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)
!      
("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|pam\\.d/.*\\|permissions\\|protocols\\|rpc\\|services\\)\\'"
 . conf-space-mode)
!      
("\\`/etc/\\(?:default/.*\\|aliases\\|group-?\\|hosts\\..+\\|ksysguarddrc\\|opera6rc\\|passwd-?\\|shadow-?\\)\\'"
 . conf-mode)
       ;; either user's dot-files or under /etc or some such
       ("/\\.?\\(?:gnokiirc\\|kde.*rc\\|mime\\.types\\|wgetrc\\)\\'" . 
conf-mode)
       ;; alas not all ~/.*rc files are like this
!      
("/\\.\\(?:enigma\\|gltron\\|gtk\\|hxplayer\\|net\\|neverball\\|qt/.+\\|realplayer\\|scummvm\\|sversion\\|sylpheed/.+\\|xmp\\)rc\\'"
 . conf-mode)
       
("/\\.\\(?:gdbtkinit\\|grip\\|orbital/.+txt\\|rhosts\\|tuxracer/options\\)\\'" 
. conf-mode)
       ("/\\.?X\\(?:default\\|resource\\|re\\)s\\>" . conf-xdefaults-mode)
       ("/X11.+app-defaults/" . conf-xdefaults-mode)