aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1996-01-19 22:43:41 +0000
committerKarl Heuer1996-01-19 22:43:41 +0000
commita96c462fce18dfc714388298333035c08653e345 (patch)
tree3cf834616d5a1866db06c90c8d3b380913db4f73
parent89132f25ac86ea650a198a3cc23bc838ce363b1a (diff)
downloademacs-a96c462fce18dfc714388298333035c08653e345.tar.gz
emacs-a96c462fce18dfc714388298333035c08653e345.zip
(tpu-load-xkeys): Use `convert-standard-filename' to
set the name of the key mapping file.
-rw-r--r--lisp/emulation/tpu-edt.el14
1 files changed, 10 insertions, 4 deletions
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 3961240e6fd..f088e53f29e 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -2367,12 +2367,18 @@ If FILE is nil, try to load a default file. The default file names are
2367 (tpu-xkeys-file 2367 (tpu-xkeys-file
2368 (setq file (expand-file-name tpu-xkeys-file))) 2368 (setq file (expand-file-name tpu-xkeys-file)))
2369 (tpu-lucid-emacs19-p 2369 (tpu-lucid-emacs19-p
2370 (setq file (expand-file-name "~/.tpu-lucid-keys"))) 2370 (setq file (convert-standard-filename
2371 (expand-file-name "~/.tpu-lucid-keys"))))
2371 (tpu-emacs19-p 2372 (tpu-emacs19-p
2372 (setq file (expand-file-name "~/.tpu-keys")) 2373 (setq file (convert-standard-filename
2374 (expand-file-name "~/.tpu-keys")))
2373 (and (not (file-exists-p file)) 2375 (and (not (file-exists-p file))
2374 (file-exists-p (expand-file-name "~/.tpu-gnu-keys")) 2376 (file-exists-p
2375 (tpu-copy-keyfile (expand-file-name "~/.tpu-gnu-keys") file)))) 2377 (convert-standard-filename
2378 (expand-file-name "~/.tpu-gnu-keys")))
2379 (tpu-copy-keyfile
2380 (convert-standard-filename
2381 (expand-file-name "~/.tpu-gnu-keys") file)))))
2376 (cond ((file-readable-p file) 2382 (cond ((file-readable-p file)
2377 (load-file file)) 2383 (load-file file))
2378 (t 2384 (t