[Emacs-diffs] Changes to emacs/lisp/net/rcirc.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/01/02 02:20:58

Index: net/rcirc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/rcirc.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- net/rcirc.el        8 Dec 2007 01:02:23 -0000       1.41
+++ net/rcirc.el        2 Jan 2008 02:20:56 -0000       1.42
@@ -1480,10 +1480,25 @@
        (run-hook-with-args 'rcirc-print-hooks
                            process sender response target text)))))
 
+(defcustom rcirc-log-filename-function 'rcirc-generate-new-buffer-name
+  "A function to generate the filename used by rcirc's logging facility.
+
+It is called with two arguments, PROCESS and TARGET (see
+`rcirc-generate-new-buffer-name' for their meaning), and should
+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'."
+  :group 'rcirc
+  :type 'function)
+
 (defun rcirc-log (process sender response target text)
   "Record line in `rcirc-log', to be later written to disk."
-  (let* ((filename (rcirc-generate-new-buffer-name process target))
-        (cell (assoc-string filename rcirc-log-alist))
+  (let ((filename (funcall rcirc-log-filename-function process target)))
+    (unless (null filename)
+      (let ((cell (assoc-string filename rcirc-log-alist))
         (line (concat (format-time-string rcirc-time-format)
                       (substring-no-properties
                        (rcirc-format-response-string process sender
@@ -1492,20 +1507,20 @@
     (if cell
        (setcdr cell (concat (cdr cell) line))
       (setq rcirc-log-alist
-           (cons (cons filename line) rcirc-log-alist)))))
+               (cons (cons filename line) rcirc-log-alist)))))))
 
 (defun rcirc-log-write ()
   "Flush `rcirc-log-alist' data to disk.
 
-Log data is written to `rcirc-log-directory'."
-  (make-directory rcirc-log-directory t)
+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))
+         (coding-system-for-write 'utf-8))
+      (make-directory (file-name-directory filename) t)
     (with-temp-buffer
       (insert (cdr cell))
-      (let ((coding-system-for-write 'utf-8))
-       (write-region (point-min) (point-max)
-                     (concat rcirc-log-directory "/" (car cell))
-                     t 'quiet))))
+       (write-region (point-min) (point-max) filename t 'quiet))))
   (setq rcirc-log-alist nil))
 
 (defun rcirc-join-channels (process channels)