Mercurial > emacs
changeset 108796:7a3558eb670e
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 ".").
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 26 May 2010 10:19:15 -0400 |
| parents | 3b30e312882a |
| children | d674108e8753 10ebbc5247aa |
| files | lisp/ChangeLog lisp/emulation/edt.el lisp/org/ChangeLog lisp/org/org.el lisp/progmodes/ada-xref.el |
| diffstat | 5 files changed, 26 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed May 26 12:13:45 2010 +0200 +++ b/lisp/ChangeLog Wed May 26 10:19:15 2010 -0400 @@ -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.
--- a/lisp/emulation/edt.el Wed May 26 12:13:45 2010 +0200 +++ b/lisp/emulation/edt.el Wed May 26 10:19:15 2010 -0400 @@ -2072,7 +2072,7 @@ 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 @@ ;;; 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 @@ ;;; ;;; 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
--- a/lisp/org/ChangeLog Wed May 26 12:13:45 2010 +0200 +++ b/lisp/org/ChangeLog Wed May 26 10:19:15 2010 -0400 @@ -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.
--- a/lisp/org/org.el Wed May 26 12:13:45 2010 +0200 +++ b/lisp/org/org.el Wed May 26 10:19:15 2010 -0400 @@ -8316,7 +8316,7 @@ (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
--- a/lisp/progmodes/ada-xref.el Wed May 26 12:13:45 2010 +0200 +++ b/lisp/progmodes/ada-xref.el Wed May 26 10:19:15 2010 -0400 @@ -381,9 +381,9 @@ (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 @@ (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)))))