From 92464ae63f6bae0f1cf889389548ec51a2ff36dc Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 9 Apr 2003 19:06:19 +0000 Subject: [PATCH] (file-chase-links): Fix previous change. --- lisp/ChangeLog | 4 ++++ lisp/files.el | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 003ae0f9c2c..937da2bd58a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2003-04-09 Richard M. Stallman + + * files.el (file-chase-links): Fix previous change. + 2003-04-09 Juanma Barranquero * frame.el (new-frame): Add obsolescence declaration. diff --git a/lisp/files.el b/lisp/files.el index 1d8cc2aa45e..d11014a9a0c 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -745,12 +745,11 @@ directory name is a symbolic link. 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))) + (count 0)) (while (and (or (null limit) (< count limit)) (setq tem (file-symlink-p newname))) (save-match-data - (if (= count max) + (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,7 +768,7 @@ it means chase no more than that many links and then stop." ;; 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)))) + (setq count (1+ count)))) newname)) (defun recode-file-name (file coding new-coding &optional ok-if-already-exists) -- 2.39.2