# HG changeset patch # User youngs # Date 1051915864 0 # Node ID a939d086aa0fdcfc7082f068291693d9f6f7f0ce # Parent ba33dbcfd77e70f9cc80b7e3916be2448e2fb641 [xemacs-hg @ 2003-05-02 22:51:04 by youngs] 2003-05-03 Steve Youngs * package-admin.el (package-admin-find-top-directory): You can't concat a string & a char, so convert 'directory-sep-char' to a string. diff -r ba33dbcfd77e -r a939d086aa0f lisp/ChangeLog --- a/lisp/ChangeLog Fri May 02 21:52:24 2003 +0000 +++ b/lisp/ChangeLog Fri May 02 22:51:04 2003 +0000 @@ -1,3 +1,8 @@ +2003-05-03 Steve Youngs + + * package-admin.el (package-admin-find-top-directory): You can't + concat a string & a char, so convert 'directory-sep-char' to a string. + 2003-05-02 Stephen J. Turnbull * cmdloop.el (command-error): Ensure exit msg is on separate line. diff -r ba33dbcfd77e -r a939d086aa0f lisp/package-admin.el --- a/lisp/package-admin.el Fri May 02 21:52:24 2003 +0000 +++ b/lisp/package-admin.el Fri May 02 22:51:04 2003 +0000 @@ -174,13 +174,13 @@ (cond ((eq type 'std) (while path-list (if (equal (substring (car path-list) -16) - (concat "xemacs-packages" directory-sep-char)) + (concat "xemacs-packages" (char-to-string directory-sep-char))) (setq top-dir (car path-list))) (setq path-list (cdr path-list)))) ((eq type 'mule) (while path-list (if (equal (substring (car path-list) -14) - (concat "mule-packages" directory-sep-char)) + (concat "mule-packages" (char-to-string directory-sep-char))) (setq top-dir (car path-list))) (setq path-list (cdr path-list))))))) ;; Wasn't in the environment, try `user-init-directory' if @@ -201,13 +201,13 @@ (cond ((eq type 'std) (while path-list (if (equal (substring (car path-list) -16) - (concat "xemacs-packages" directory-sep-char)) + (concat "xemacs-packages" (char-to-string directory-sep-char))) (setq top-dir (car path-list))) (setq path-list (cdr path-list)))) ((eq type 'mule) (while path-list (if (equal (substring (car path-list) -14) - (concat "mule-packages" directory-sep-char)) + (concat "mule-packages" (char-to-string directory-sep-char))) (setq top-dir (car path-list))) (setq path-list (cdr path-list))))))) ;; Now return either the directory or nil.