diff options
| author | Arne Jørgensen | 2012-10-20 19:34:06 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-10-20 19:34:06 +0800 |
| commit | 79e1997aa81717a59d134c677b1fdcf7eb12d257 (patch) | |
| tree | c222ad14690cd31486da40ac6322224b4731bf1a | |
| parent | 2068905bb73c32afb4bb5e908b438fbd8b80bb64 (diff) | |
| download | emacs-79e1997aa81717a59d134c677b1fdcf7eb12d257.tar.gz emacs-79e1997aa81717a59d134c677b1fdcf7eb12d257.zip | |
* progmodes/flymake.el (flymake-create-temp-inplace): Use file-truename.
Patch from:
http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00444.html
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/flymake.el | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 323ba976c80..dfd18592d0e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-10-20 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/flymake.el (flymake-create-temp-inplace): Use | ||
| 4 | file-truename. | ||
| 5 | |||
| 1 | 2012-10-20 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-10-20 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * loadup.el: Update comment about uncompiled Lisp files. (Bug#12395) | 8 | * loadup.el: Update comment about uncompiled Lisp files. (Bug#12395) |
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 26d4a399c2d..2614af9ffa4 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el | |||
| @@ -1535,10 +1535,11 @@ if ARG is omitted or nil." | |||
| 1535 | (error "Invalid file-name")) | 1535 | (error "Invalid file-name")) |
| 1536 | (or prefix | 1536 | (or prefix |
| 1537 | (setq prefix "flymake")) | 1537 | (setq prefix "flymake")) |
| 1538 | (let* ((temp-name (concat (file-name-sans-extension file-name) | 1538 | (let* ((ext (file-name-extension file-name)) |
| 1539 | "_" prefix | 1539 | (temp-name (file-truename |
| 1540 | (and (file-name-extension file-name) | 1540 | (concat (file-name-sans-extension file-name) |
| 1541 | (concat "." (file-name-extension file-name)))))) | 1541 | "_" prefix |
| 1542 | (and ext (concat "." ext)))))) | ||
| 1542 | (flymake-log 3 "create-temp-inplace: file=%s temp=%s" file-name temp-name) | 1543 | (flymake-log 3 "create-temp-inplace: file=%s temp=%s" file-name temp-name) |
| 1543 | temp-name)) | 1544 | temp-name)) |
| 1544 | 1545 | ||