Merge changes from emacs-23 branch

[gnu-emacs] / lisp / find-lisp.el

diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index 5cedaa60e35f3f51fcaf6a7b8a58b7c8b5eea3a6..cacfd57e9fb72f7239a06f4448e82ff0e89363b4 100644 (file)
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -3,17 +3,15 @@
 ;; Author: Peter Breton
 ;; Created: Fri Mar 26 1999
 ;; Keywords: unix
-;; Time-stamp: <2006-02-06 13:40:10 ttn>
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -96,7 +92,7 @@ PARENT is the parent directory of DIR."
           (string= dir "..")
           ;; Skip directories which are symlinks
           ;; Easy way to circumvent recursive loops
-          (file-symlink-p dir))))
+          (file-symlink-p (expand-file-name dir parent)))))
 
 (defun find-lisp-default-file-predicate  (file dir)
   "True if FILE matches `find-lisp-regexp'.
@@ -271,7 +267,7 @@ It is a function which takes two arguments, the directory and its parent."
     ;; No analog for find-lisp?
     (insert find-lisp-line-indent "\n")
     ;; Run the find function
-    (mapcar
+    (mapc
      (function
       (lambda(file)
        (find-lisp-find-dired-insert-file
@@ -359,5 +355,4 @@ It is a function which takes two arguments, the directory and its parent."
 
 (provide 'find-lisp)
 
-;;; arch-tag: a711374c-f12a-46f6-aa18-ba7d77b9602a
 ;;; find-lisp.el ends here