From 186ecaf1a6d22b7e0eae83ba31136d90fb5a49a6 Mon Sep 17 00:00:00 2001 From: Deniz Dogan Date: Mon, 31 Jan 2011 16:19:57 +0100 Subject: [PATCH] * lisp/net/rcirc.el: Clean log filenames (Bug#7933). (rcirc-log-write): Use convert-standard-filename. (rcirc-log-filename-function): Documentation updates. --- lisp/ChangeLog | 6 ++++++ lisp/net/rcirc.el | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f69b32a4878..d9e4d58af59 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-01-31 Deniz Dogan + + * net/rcirc.el: Clean log filenames (Bug#7933). + (rcirc-log-write): Use convert-standard-filename. + (rcirc-log-filename-function): Documentation updates. + 2011-01-30 Jan Djärv * mail/emacsbug.el (report-emacs-bug-insert-to-mailer): Check diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 60efa9dd3ee..59a7b176088 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -1565,8 +1565,11 @@ return the filename, or nil if no logging is desired for this session. If the returned filename is absolute (`file-name-absolute-p' -returns true), then it is used as-is, otherwise the resulting -file is put into `rcirc-log-directory'." +returns t), then it is used as-is, otherwise the resulting file +is put into `rcirc-log-directory'. + +The filename is then cleaned using `convert-standard-filename' to +guarantee valid filenames for the current OS." :group 'rcirc :type 'function) @@ -1591,7 +1594,9 @@ file is put into `rcirc-log-directory'." Log data is written to `rcirc-log-directory', except for log-files with absolute names (see `rcirc-log-filename-function')." (dolist (cell rcirc-log-alist) - (let ((filename (expand-file-name (car cell) rcirc-log-directory)) + (let ((filename (convert-standard-filename + (expand-file-name (car cell) + rcirc-log-directory))) (coding-system-for-write 'utf-8)) (make-directory (file-name-directory filename) t) (with-temp-buffer -- 2.11.4.GIT