diff options
| author | Lars Ingebrigtsen | 2018-04-14 21:18:51 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2018-04-14 21:18:51 +0200 |
| commit | 94b9fe59986c368ac2bb1024d3487dea73658788 (patch) | |
| tree | 313822dfa646f47ae43214b626c3dc918893b754 | |
| parent | 7e012d038422605e44afbc916769e51f6682dbce (diff) | |
| download | emacs-94b9fe59986c368ac2bb1024d3487dea73658788.tar.gz emacs-94b9fe59986c368ac2bb1024d3487dea73658788.zip | |
Make erc-current-logfile work with explicit parameter
* lisp/erc/erc-log.el (erc-current-logfile): This function
apparently refers to buffer-local variables, so switch to the
buffer given before calculating the file name (bug#16111).
| -rw-r--r-- | lisp/erc/erc-log.el | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el index 1dd2e0aba49..584f566f049 100644 --- a/lisp/erc/erc-log.el +++ b/lisp/erc/erc-log.el | |||
| @@ -344,18 +344,19 @@ If BUFFER is nil, the value of `current-buffer' is used. | |||
| 344 | This is determined by `erc-generate-log-file-name-function'. | 344 | This is determined by `erc-generate-log-file-name-function'. |
| 345 | The result is converted to lowercase, as IRC is case-insensitive" | 345 | The result is converted to lowercase, as IRC is case-insensitive" |
| 346 | (unless buffer (setq buffer (current-buffer))) | 346 | (unless buffer (setq buffer (current-buffer))) |
| 347 | (let ((target (or (buffer-name buffer) (erc-default-target))) | 347 | (with-current-buffer buffer |
| 348 | (nick (erc-current-nick)) | 348 | (let ((target (or (buffer-name buffer) (erc-default-target))) |
| 349 | (server erc-session-server) | 349 | (nick (erc-current-nick)) |
| 350 | (port erc-session-port)) | 350 | (server erc-session-server) |
| 351 | (expand-file-name | 351 | (port erc-session-port)) |
| 352 | (erc-log-standardize-name | 352 | (expand-file-name |
| 353 | (funcall erc-generate-log-file-name-function | 353 | (erc-log-standardize-name |
| 354 | buffer target nick server port)) | 354 | (funcall erc-generate-log-file-name-function |
| 355 | (if (functionp erc-log-channels-directory) | 355 | buffer target nick server port)) |
| 356 | (funcall erc-log-channels-directory | 356 | (if (functionp erc-log-channels-directory) |
| 357 | buffer target nick server port) | 357 | (funcall erc-log-channels-directory |
| 358 | erc-log-channels-directory)))) | 358 | buffer target nick server port) |
| 359 | erc-log-channels-directory))))) | ||
| 359 | 360 | ||
| 360 | (defun erc-generate-log-file-name-with-date (buffer &rest ignore) | 361 | (defun erc-generate-log-file-name-with-date (buffer &rest ignore) |
| 361 | "This function computes a short log file name. | 362 | "This function computes a short log file name. |