diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-06-18 16:28:22 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-06-18 16:28:22 +0000 |
| commit | dc115a0d66305982deddf9d66e48661b53aab074 (patch) | |
| tree | c59e68f64deff92dad3a46f43b86f9480bcb20d5 | |
| parent | 03848ba9a1f80c8718922efa8a9efbf6d3ac6d6c (diff) | |
| download | emacs-dc115a0d66305982deddf9d66e48661b53aab074.tar.gz | |
(he-concat-directory-file-name): Directory part may be nil.
(he-file-name-nondirectory): Referenced external variable.
| -rw-r--r-- | lisp/hippie-exp.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index bb59ac68382..ddb896befdb 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el @@ -483,11 +483,12 @@ otherwise." (if (memq system-type '(vax-vms axp-vms)) (or (file-directory-p file) (file-directory-p (concat file "[000000]"))) - (file-directory-p dir-part))) + (file-directory-p file))) (defun he-concat-directory-file-name (dir-part name-part) "Try to slam together two parts of a file specification, system dependently." - (cond ((memq system-type '(axp-vms vax-vms)) + (cond ((null dir-part) name-part) + ((memq system-type '(axp-vms vax-vms)) (if (and (string= (substring dir-part -1) "]") (string= (substring name-part 0 2) "[.")) (concat (substring dir-part 0 -1) (substring name-part 1)) |