emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] emacs/lisp files.el


From: Jason Rumney
Subject: [Emacs-diffs] emacs/lisp files.el
Date: Tue, 17 Feb 2009 14:27:29 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/02/17 14:27:28

Modified files:
        lisp           : files.el 

Log message:
        (make-directory): Stop recursing if parent is self. (Bug#2309)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1035&r2=1.1036

Patches:
Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1035
retrieving revision 1.1036
diff -u -b -r1.1035 -r1.1036
--- files.el    13 Feb 2009 15:14:33 -0000      1.1035
+++ files.el    17 Feb 2009 14:27:28 -0000      1.1036
@@ -4541,7 +4541,12 @@
          (make-directory-internal dir)
        (let ((dir (directory-file-name (expand-file-name dir)))
              create-list)
-         (while (not (file-exists-p dir))
+         (while (and (not (file-exists-p dir))
+                     ;; If directory is its own parent, then we can't
+                     ;; keep looping forever
+                     (not (equal dir
+                                 (directory-file-name
+                                  (file-name-directory dir)))))
            (setq create-list (cons dir create-list)
                  dir (directory-file-name (file-name-directory dir))))
          (while create-list




reply via email to

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