Mercurial > hg > xemacs-beta
comparison lisp/package-admin.el @ 1447:a939d086aa0f
[xemacs-hg @ 2003-05-02 22:51:04 by youngs]
2003-05-03 Steve Youngs <youngs@xemacs.org>
* package-admin.el (package-admin-find-top-directory): You can't
concat a string & a char, so convert 'directory-sep-char' to a string.
| author | youngs |
|---|---|
| date | Fri, 02 May 2003 22:51:04 +0000 |
| parents | 44de306310b8 |
| children | 6f4c71266175 |
comparison
equal
deleted
inserted
replaced
| 1446:ba33dbcfd77e | 1447:a939d086aa0f |
|---|---|
| 172 (if env-value | 172 (if env-value |
| 173 (let ((path-list (paths-decode-directory-path env-value 'drop-empties))) | 173 (let ((path-list (paths-decode-directory-path env-value 'drop-empties))) |
| 174 (cond ((eq type 'std) | 174 (cond ((eq type 'std) |
| 175 (while path-list | 175 (while path-list |
| 176 (if (equal (substring (car path-list) -16) | 176 (if (equal (substring (car path-list) -16) |
| 177 (concat "xemacs-packages" directory-sep-char)) | 177 (concat "xemacs-packages" (char-to-string directory-sep-char))) |
| 178 (setq top-dir (car path-list))) | 178 (setq top-dir (car path-list))) |
| 179 (setq path-list (cdr path-list)))) | 179 (setq path-list (cdr path-list)))) |
| 180 ((eq type 'mule) | 180 ((eq type 'mule) |
| 181 (while path-list | 181 (while path-list |
| 182 (if (equal (substring (car path-list) -14) | 182 (if (equal (substring (car path-list) -14) |
| 183 (concat "mule-packages" directory-sep-char)) | 183 (concat "mule-packages" (char-to-string directory-sep-char))) |
| 184 (setq top-dir (car path-list))) | 184 (setq top-dir (car path-list))) |
| 185 (setq path-list (cdr path-list))))))) | 185 (setq path-list (cdr path-list))))))) |
| 186 ;; Wasn't in the environment, try `user-init-directory' if | 186 ;; Wasn't in the environment, try `user-init-directory' if |
| 187 ;; USER-DIR is non-nil. | 187 ;; USER-DIR is non-nil. |
| 188 (if (and user-dir | 188 (if (and user-dir |
| 199 emacs-data-roots | 199 emacs-data-roots |
| 200 (packages-compute-package-locations user-init-directory))))) | 200 (packages-compute-package-locations user-init-directory))))) |
| 201 (cond ((eq type 'std) | 201 (cond ((eq type 'std) |
| 202 (while path-list | 202 (while path-list |
| 203 (if (equal (substring (car path-list) -16) | 203 (if (equal (substring (car path-list) -16) |
| 204 (concat "xemacs-packages" directory-sep-char)) | 204 (concat "xemacs-packages" (char-to-string directory-sep-char))) |
| 205 (setq top-dir (car path-list))) | 205 (setq top-dir (car path-list))) |
| 206 (setq path-list (cdr path-list)))) | 206 (setq path-list (cdr path-list)))) |
| 207 ((eq type 'mule) | 207 ((eq type 'mule) |
| 208 (while path-list | 208 (while path-list |
| 209 (if (equal (substring (car path-list) -14) | 209 (if (equal (substring (car path-list) -14) |
| 210 (concat "mule-packages" directory-sep-char)) | 210 (concat "mule-packages" (char-to-string directory-sep-char))) |
| 211 (setq top-dir (car path-list))) | 211 (setq top-dir (car path-list))) |
| 212 (setq path-list (cdr path-list))))))) | 212 (setq path-list (cdr path-list))))))) |
| 213 ;; Now return either the directory or nil. | 213 ;; Now return either the directory or nil. |
| 214 top-dir)) | 214 top-dir)) |
| 215 | 215 |