procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid (expand-file-name ".").

Browse source 
* org.el (org-file-complete-link):
* progmodes/ada-xref.el (ada-gnat-parse-gpr):
* emulation/edt.el (edt-load-keys): Avoid (expand-file-name ".").
This commit is contained in:
Stefan Monnier 2010-05-26 10:19:15 -04:00
parent 9841cb4f56
commit 6dc439cbcc
5 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -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.

16
lisp/emulation/edt.el
View file

@ -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

4
lisp/org/ChangeLog
View file

@ -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.

2
lisp/org/org.el
View file

@ -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

12
lisp/progmodes/ada-xref.el
View file

@ -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)))))