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

[Sam Steingold]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.579 emacs/lisp/files.el:1.580
*** emacs/lisp/files.el:1.579   Thu May 30 13:13:54 2002
--- emacs/lisp/files.el Sat Jun  1 14:04:35 2002
***************
*** 303,309 ****
  If it matches, `replace-match' is used to replace the
  matching part with REPLACEMENT.
  If the optional element UNIQUIFY is non-nil, the auto-save file name is
! constructed by taking the directory part of the replaced file-name, 
  concatenated with the buffer file name with all directory separators
  changed to `!' to prevent clashes.  This will not work
  correctly if your filesystem truncates the resulting name.
--- 303,309 ----
  If it matches, `replace-match' is used to replace the
  matching part with REPLACEMENT.
  If the optional element UNIQUIFY is non-nil, the auto-save file name is
! constructed by taking the directory part of the replaced file-name,
  concatenated with the buffer file name with all directory separators
  changed to `!' to prevent clashes.  This will not work
  correctly if your filesystem truncates the resulting name.
***************
*** 483,489 ****
    (unless dir
      (setq dir default-directory))
    (unless default-dirname
!     (setq default-dirname 
          (if initial (concat dir initial) default-directory)))
    (read-file-name prompt dir default-dirname mustmatch initial
                  'file-directory-p))
--- 483,489 ----
    (unless dir
      (setq dir default-directory))
    (unless default-dirname
!     (setq default-dirname
          (if initial (concat dir initial) default-directory)))
    (read-file-name prompt dir default-dirname mustmatch initial
                  'file-directory-p))
***************
*** 1179,1185 ****
                  (unless (or (eq read-only buffer-file-read-only)
                              (eq read-only buffer-read-only))
                    (when (or nowarn
!                             (let ((question 
                                     (format "File %s is %s on disk.  Change 
buffer mode? "
                                             buffer-file-name
                                             (if read-only "read-only" 
"writable"))))
--- 1179,1185 ----
                  (unless (or (eq read-only buffer-file-read-only)
                              (eq read-only buffer-read-only))
                    (when (or nowarn
!                             (let ((question
                                     (format "File %s is %s on disk.  Change 
buffer mode? "
                                             buffer-file-name
                                             (if read-only "read-only" 
"writable"))))
***************
*** 1461,1467 ****
    (mapc
     (lambda (elt)
       (cons (purecopy (car elt)) (cdr elt)))
!    '(("\\.te?xt\\'" . text-mode)
       ("\\.c\\'" . c-mode)
       ("\\.h\\'" . c-mode)
       ("\\.tex\\'" . tex-mode)
--- 1461,1468 ----
    (mapc
     (lambda (elt)
       (cons (purecopy (car elt)) (cdr elt)))
!    '(("\\.in\\'" nil t)
!      ("\\.te?xt\\'" . text-mode)
       ("\\.c\\'" . c-mode)
       ("\\.h\\'" . c-mode)
       ("\\.tex\\'" . tex-mode)
***************
*** 1492,1498 ****
       ("\\.m\\'" . objc-mode)
       ("\\.java\\'" . java-mode)
       ("\\.mk\\'" . makefile-mode)
!      ("\\(M\\|m\\|GNUm\\)akefile\\(\\.in\\)?\\'" . makefile-mode)
       ("\\.am\\'" . makefile-mode)     ;For Automake.
       ;; Less common extensions come here
       ;; so more common ones above are found faster.
--- 1493,1499 ----
       ("\\.m\\'" . objc-mode)
       ("\\.java\\'" . java-mode)
       ("\\.mk\\'" . makefile-mode)
!      ("\\(M\\|m\\|GNUm\\)akefile\\'" . makefile-mode)
       ("\\.am\\'" . makefile-mode)     ;For Automake.
       ;; Less common extensions come here
       ;; so more common ones above are found faster.