Mercurial > emacs

changeset 15447:41bce2c4b1b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(he-concat-directory-file-name): Directory part may be nil. (he-file-name-nondirectory): Referenced external variable.
author Richard M. Stallman <rms@gnu.org>
date Tue, 18 Jun 1996 16:28:22 +0000
parents 13e4d0daa8c1
children 593dadb4f287
files lisp/hippie-exp.el
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/hippie-exp.el	Tue Jun 18 16:22:55 1996 +0000
+++ b/lisp/hippie-exp.el	Tue Jun 18 16:28:22 1996 +0000
@@ -483,11 +483,12 @@
   (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))