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 ".").

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6a02ab6cb586707487ccbddff1f276bb7883b5f..59ba9d5516305019fd40198f0da7cf1ed2c4356e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/ada-xref.el (ada-gnat-parse-gpr):
+       * emulation/edt.el (edt-load-keys): Avoid (expand-file-name ".").
+
 2010-05-26  Glenn Morris  <rgm@gnu.org>
 
        * emulation/edt.el (edt-load-keys): Use locate-library.
@@ -6,8 +11,8 @@
 
        * log-edit.el (log-edit-strip-single-file-name): Default to nil.
        (log-edit-changelog-entries): Doc fix.
-       (log-edit-changelog-insert-entries): Args changed.  Rename
-       relative filenames in ChangeLog entries.  Delete tabs.
+       (log-edit-changelog-insert-entries): Args changed.
+       Rename relative filenames in ChangeLog entries.  Delete tabs.
        (log-edit-insert-changelog-entries): Reorganize return value of
        `log-edit-changelog-entries' to pass filenames to
        log-edit-changelog-insert-entries.

diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 913e5054c47ac77179d77e815ae1ee5e3d9da0f9..88b74afe86bfb019693e5fc6a0566bddbbb723a0 100644 (file)
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -2072,7 +2072,7 @@ created."
      use it!  Perhaps it's lying around here someplace. \n     ")
          (let ((path (locate-library
                       "edt-mapper"
-                      nil (append (list (expand-file-name ".")) load-path))))
+                      nil (append (list default-directory) load-path))))
            (if path
                (progn
                  (insert (format
@@ -2563,12 +2563,12 @@ Argument GOLD-BINDING is the Emacs function to be bound to GOLD <KEY>."
 ;;; DEFAULT EDT KEYPAD HELP
 ;;;
 
-;;;
-;;; Upper case commands in the keypad diagram below indicate that the
-;;; emulation should look and feel very much like EDT.  Lower case
-;;; commands are enhancements and/or additions to the EDT keypad
-;;; commands or are native Emacs commands.
-;;;
+;;
+;; Upper case commands in the keypad diagram below indicate that the
+;; emulation should look and feel very much like EDT.  Lower case
+;; commands are enhancements and/or additions to the EDT keypad
+;; commands or are native Emacs commands.
+;;
 
 (defun edt-keypad-help ()
   "DEFAULT EDT Keypad Active.
@@ -2677,7 +2677,7 @@ G-C-\\: Split Window                     |  FNDNXT  |   Yank   |   CUT    |
 
 ;;;
 ;;; EDT emulation screen width commands.
-;;;
+;;
 ;; Some terminals require modification of terminal attributes when
 ;; changing the number of columns displayed, hence the fboundp tests
 ;; below.  These functions are defined in the corresponding terminal

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index f157fc5d2911d8aaad33b9cbee9d3cc58cf5763e..35007edfe15491aebfed8fa7cc9ea3f0ce9f8035 100644 (file)
--- 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 98179ed9d063def2e10a6f26228e0c23eacc12a1..7aa385fee9d50e1b0843379a03cb5891752f310c 100644 (file)
--- 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

diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index bf836b20eee57f95016818179d9978bccd2b8006..5eefe3406467ee4060c23e6c618193b3fef5580c 100644 (file)
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -381,9 +381,9 @@ Assumes environment variable ADA_PROJECT_PATH is set properly."
          (forward-line 1) ; first directory in list
          (while (not (looking-at "^$")) ; terminate on blank line
            (back-to-indentation) ; skip whitespace
-           (if (looking-at "<Current_Directory>")
-               (add-to-list 'src-dir  (expand-file-name "."))
-             (add-to-list 'src-dir
+           (add-to-list 'src-dir
+                         (if (looking-at "<Current_Directory>")
+                             default-directory
                           (expand-file-name
                            (buffer-substring-no-properties
                             (point) (line-end-position)))))
@@ -395,9 +395,9 @@ Assumes environment variable ADA_PROJECT_PATH is set properly."
          (forward-line 1)
          (while (not (looking-at "^$"))
            (back-to-indentation)
-           (if (looking-at "<Current_Directory>")
-               (add-to-list 'obj-dir (expand-file-name "."))
-             (add-to-list 'obj-dir
+           (add-to-list 'obj-dir
+                         (if (looking-at "<Current_Directory>")
+                             default-directory
                           (expand-file-name
                            (buffer-substring-no-properties
                             (point) (line-end-position)))))