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

[Richard M. Stallman]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.568 emacs/lisp/files.el:1.569
*** emacs/lisp/files.el:1.568   Mon Apr 22 23:45:26 2002
--- emacs/lisp/files.el Sun Apr 28 18:30:22 2002
***************
*** 3372,3388 ****
          (if (string-match (car (car list)) filename)
              (setq result (replace-match (cadr (car list)) t nil
                                          filename)
!                               uniq (caddr (car list))))
          (setq list (cdr list)))
        (if result
!               (if uniq
!                       (setq filename (concat
!                                                       (file-name-directory 
result)
!                                                       (subst-char-in-string
!                                                        directory-sep-char ?!
!                                                        
(replace-regexp-in-string "!" "!!"
!                                                                               
                                 filename))))
!                 (setq filename result)))
        (setq result
              (if (and (eq system-type 'ms-dos)
                       (not (msdos-long-file-names)))
--- 3372,3388 ----
          (if (string-match (car (car list)) filename)
              (setq result (replace-match (cadr (car list)) t nil
                                          filename)
!                   uniq (caddr (car list))))
          (setq list (cdr list)))
        (if result
!           (if uniq
!               (setq filename (concat
!                               (file-name-directory result)
!                               (subst-char-in-string
!                                directory-sep-char ?!
!                                (replace-regexp-in-string "!" "!!"
!                                                          filename))))
!             (setq filename result)))
        (setq result
              (if (and (eq system-type 'ms-dos)
                       (not (msdos-long-file-names)))
***************
*** 3447,3453 ****
             ;; file it creates, so we must fix the file name _before_
             ;; make-temp-file is called.
             (convert-standard-filename fname)
!          fname))))))
  
  (defun auto-save-file-name-p (filename)
    "Return non-nil if FILENAME can be yielded by `make-auto-save-file-name'.
--- 3447,3454 ----
             ;; file it creates, so we must fix the file name _before_
             ;; make-temp-file is called.
             (convert-standard-filename fname)
!          fname))
!        nil "#"))))
  
  (defun auto-save-file-name-p (filename)
    "Return non-nil if FILENAME can be yielded by `make-auto-save-file-name'.