[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100439: Backport Bug#7933 fix from trunk.

[Chong Yidong]

------------------------------------------------------------
revno: 100439
author: Deniz Dogan <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-01-31 18:11:29 -0500
message:
  Backport Bug#7933 fix from trunk.
  
  * 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-31 23:07:43 +0000
+++ b/lisp/ChangeLog    2011-01-31 23:11:29 +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-31  Alan Mackenzie  <address@hidden>
 
        * progmodes/cc-cmds.el (c-forward-over-illiterals): Continue

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-01-02 23:50:46 +0000
+++ b/lisp/net/rcirc.el 2011-01-31 23:11:29 +0000
@@ -1520,8 +1520,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)
 
@@ -1546,7 +1549,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