[Emacs-diffs] /srv/bzr/emacs/trunk r103050: * lisp/net/rcirc.el: Clean log filenames (Bug#7933).

[Deniz Dogan]

------------------------------------------------------------
revno: 103050
committer: Deniz Dogan <address@hidden>
branch nick: emacs-trunk
timestamp: Mon 2011-01-31 16:19:57 +0100
message:
  * lisp/net/rcirc.el: Clean log filenames (Bug#7933).
  (rcirc-log-write): Use convert-standard-filename.
  (rcirc-log-filename-function): Documentation updates.
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-30 18:59:58 +0000
+++ b/lisp/ChangeLog    2011-01-31 15:19:57 +0000
@@ -1,3 +1,9 @@
+2011-01-31  Deniz Dogan  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/emacsbug.el (report-emacs-bug-insert-to-mailer): Check

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-01-26 08:36:39 +0000
+++ b/lisp/net/rcirc.el 2011-01-31 15:19:57 +0000
@@ -1565,8 +1565,11 @@
 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 @@
 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