X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fapel.git;a=blobdiff_plain;f=path-util.el;h=2d004db2ebd0e3322c7e30d0920866252bd0421b;hp=e6aec378ea6e41e33ed4cd8219c4754395339e86;hb=8b0dbe5092ae30b5092d7abf96649f96635d1060;hpb=7ef7670b2e760f58d355034bca4ae1e267052f69

diff --git a/path-util.el b/path-util.el
index e6aec37..2d004db 100644
--- a/path-util.el
+++ b/path-util.el
@@ -19,8 +19,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -38,7 +38,7 @@ directories and it does not exist in `load-path'.
 
 You can use following PATH styles:
 	load-path relative: \"PATH/\"
-			(it is searched from `defaul-load-path')
+			(it is searched from `default-load-path')
 	home directory relative: \"~/PATH/\" \"~USER/PATH/\"
 	absolute path: \"/HOO/BAR/BAZ/\"
 
@@ -54,18 +54,16 @@ You can specify following OPTIONS:
 	       (while rest
 		 (setq p (expand-file-name path (car rest)))
 		 (if (file-directory-p p)
-		     (throw 'tag p)
-		   )
-		 (setq rest (cdr rest))
-		 ))
-	     (not (member p load-path))
-	     )
+		     (throw 'tag p))
+		 (setq rest (cdr rest))))
+	     (not (or (member p load-path)
+		      (if (string-match "/$" p)
+			  (member (substring p 0 (1- (length p))) load-path)
+			(member (file-name-as-directory p) load-path)))))
 	(setq load-path
 	      (if (memq 'append options)
 		  (append load-path (list p))
-		(cons p load-path)
-		))
-      )))
+		(cons p load-path))))))
 
 ;;;###autoload
 (defun add-latest-path (pattern &optional all-paths)
@@ -142,7 +140,7 @@ If suffixes is omitted, `exec-suffix-list' is used."
   (let (files)
     (catch 'tag
       (while suffixes
-	(let (suf (car suffixes))
+	(let ((suf (car suffixes)))
 	  (if (and (not (string= suf ""))
 		   (string-match (concat (regexp-quote suf) "$") file))
 	      (progn
@@ -197,6 +195,7 @@ If PATHS is omitted, `load-path' is used."
 ;;; @ end
 ;;;
 
-(provide 'path-util)
+(require 'product)
+(product-provide (provide 'path-util) (require 'apel-ver))
 
 ;;; path-util.el ends here