emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Richard M. Stallman
Subject: [Emacs-diffs] Changes to emacs/lisp/files.el
Date: Wed, 09 Apr 2003 15:06:05 -0400

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.648 emacs/lisp/files.el:1.649
*** emacs/lisp/files.el:1.648   Tue Apr  8 21:34:38 2003
--- emacs/lisp/files.el Wed Apr  9 15:06:04 2003
***************
*** 745,756 ****
  If the optional argument LIMIT is a number,
  it means chase no more than that many links and then stop."
    (let (tem (newname filename)
!           (count 0)
!           (max (max limit 100)))
      (while (and (or (null limit) (< count limit))
                (setq tem (file-symlink-p newname)))
        (save-match-data
!       (if (= count max)
            (error "Apparent cycle of symbolic links for %s" filename))
        ;; In the context of a link, `//' doesn't mean what Emacs thinks.
        (while (string-match "//+" tem)
--- 745,755 ----
  If the optional argument LIMIT is a number,
  it means chase no more than that many links and then stop."
    (let (tem (newname filename)
!           (count 0))
      (while (and (or (null limit) (< count limit))
                (setq tem (file-symlink-p newname)))
        (save-match-data
!       (if (and (null limit) (= count 100))
            (error "Apparent cycle of symbolic links for %s" filename))
        ;; In the context of a link, `//' doesn't mean what Emacs thinks.
        (while (string-match "//+" tem)
***************
*** 769,775 ****
          ;; Now find the parent of that dir.
          (setq newname (file-name-directory newname)))
        (setq newname (expand-file-name tem (file-name-directory newname)))
!       (setq count (1- count))))
      newname))
  
  (defun recode-file-name (file coding new-coding &optional 
ok-if-already-exists)
--- 768,774 ----
          ;; Now find the parent of that dir.
          (setq newname (file-name-directory newname)))
        (setq newname (expand-file-name tem (file-name-directory newname)))
!       (setq count (1+ count))))
      newname))
  
  (defun recode-file-name (file coding new-coding &optional 
ok-if-already-exists)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]