diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 89cc2106ba0..41dc46021f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-09-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/bytecomp.el (byte-compile-warning-prefix): | ||
| 4 | If not compiling a file, try using load-file-name. | ||
| 5 | |||
| 1 | 2012-09-13 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2012-09-13 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacs-lisp/edebug.el (edebug-outside-unread-command-events): | 8 | * emacs-lisp/edebug.el (edebug-outside-unread-command-events): |
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 10bc37c6dcd..c42ae21aae5 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el | |||
| @@ -1016,6 +1016,10 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." | |||
| 1016 | ((bufferp byte-compile-current-file) | 1016 | ((bufferp byte-compile-current-file) |
| 1017 | (format "Buffer %s:" | 1017 | (format "Buffer %s:" |
| 1018 | (buffer-name byte-compile-current-file))) | 1018 | (buffer-name byte-compile-current-file))) |
| 1019 | ;; We might be simply loading a file that | ||
| 1020 | ;; contains explicit calls to byte-compile functions. | ||
| 1021 | ((stringp load-file-name) | ||
| 1022 | (format "%s:" (file-relative-name load-file-name dir))) | ||
| 1019 | (t ""))) | 1023 | (t ""))) |
| 1020 | (pos (if (and byte-compile-current-file | 1024 | (pos (if (and byte-compile-current-file |
| 1021 | (integerp byte-compile-read-position)) | 1025 | (integerp byte-compile-read-position)) |