andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport Bug#7933 fix from trunk.

Browse source 
* lisp/net/rcirc.el: Clean log filenames (Bug#7933).
(rcirc-log-write): Use convert-standard-filename.
(rcirc-log-filename-function): Documentation updates.
This commit is contained in:
Deniz Dogan 2011-01-31 18:11:29 -05:00 • committed by Chong Yidong
parent 3b95603fb5
commit 113ef437f2
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2011-01-31 Deniz Dogan <deniz.a.m.dogan@gmail.com>
* 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 <acm@muc.de> 2011-01-31 Alan Mackenzie <acm@muc.de>
* progmodes/cc-cmds.el (c-forward-over-illiterals): Continue * progmodes/cc-cmds.el (c-forward-over-illiterals): Continue

11
lisp/net/rcirc.el
View file

@ -1520,8 +1520,11 @@ return the filename, or nil if no logging is desired for this
session. session.
If the returned filename is absolute (`file-name-absolute-p' If the returned filename is absolute (`file-name-absolute-p'
returns true), then it is used as-is, otherwise the resulting returns t), then it is used as-is, otherwise the resulting file
file is put into `rcirc-log-directory'." 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 :group 'rcirc
:type 'function) :type 'function)
@ -1546,7 +1549,9 @@ file is put into `rcirc-log-directory'."
Log data is written to `rcirc-log-directory', except for Log data is written to `rcirc-log-directory', except for
log-files with absolute names (see `rcirc-log-filename-function')." log-files with absolute names (see `rcirc-log-filename-function')."
(dolist (cell rcirc-log-alist) (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)) (coding-system-for-write 'utf-8))
(make-directory (file-name-directory filename) t) (make-directory (file-name-directory filename) t)
(with-temp-buffer (with-temp-buffer