summaryrefslogtreecommitdiff
path: root/lisp/org
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-05-26 10:19:15 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2010-05-26 10:19:15 -0400
commit6dc439cbcc563ff10c9ae3cf8069c26664e9bd04 (patch)
tree7b03e6d45d123f567fc544f4b0857884e203fd2b /lisp/org
parent9841cb4f56bae50c1f31d4fde591a356d3fbf5dc (diff)
downloademacs-6dc439cbcc563ff10c9ae3cf8069c26664e9bd04.tar.gz
emacs-6dc439cbcc563ff10c9ae3cf8069c26664e9bd04.tar.bz2
emacs-6dc439cbcc563ff10c9ae3cf8069c26664e9bd04.zip
Avoid (expand-file-name ".").
* org.el (org-file-complete-link): * progmodes/ada-xref.el (ada-gnat-parse-gpr): * emulation/edt.el (edt-load-keys): Avoid (expand-file-name ".").
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/ChangeLog4
-rw-r--r--lisp/org/org.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index f157fc5d291..35007edfe15 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-26 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * org.el (org-file-complete-link): Avoid (expand-file-name ".").
+
2010-05-07 Chong Yidong <cyd@stupidchicken.com>
* Version 23.2 released.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 98179ed9d06..7aa385fee9d 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -8316,7 +8316,7 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
(setq file (read-file-name "File: "))
(let ((pwd (file-name-as-directory (expand-file-name ".")))
(pwd1 (file-name-as-directory (abbreviate-file-name
- (expand-file-name ".")))))
+ default-directory))))
(cond
((equal arg '(16))
(setq link (org-make-link