Changeset 4140 for trunk/lisp/erc/erc-log.el

Timestamp:

08/10/06 11:19:54 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/erc/erc-log.el (modified) (7 diffs)

trunk/lisp/erc/erc-log.el

@@ -72 +72 @@
-
-;;; TODO:
-;; * Erc needs a generalised make-safe-file-name function, so that
-;;   generated file names don't contain any invalid file characters.
-;;
-;; * Really, we need to lock the logfiles somehow, so that if a user
@@ -219 +217 @@
-   (add-hook 'erc-part-hook 'erc-conditional-save-buffer)
-   ;; append, so that 'erc-initialize-log-marker runs first
-
+
+
+
+
-  ;; disable
-  ((remove-hook 'erc-insert-post-hook 'erc-save-buffer-in-logs)
@@ -227 +228 @@
-   (remove-hook 'erc-quit-hook 'erc-conditional-save-queries)
-   (remove-hook 'erc-part-hook 'erc-conditional-save-buffer)
-
+
+
+
+
-
-(define-key erc-mode-map "\C-c\C-l" 'erc-save-buffer-in-logs)
@@ -237 +241 @@
-  (when (erc-logging-enabled)
-    (auto-save-mode -1)
-
-
+
-    (set (make-local-variable 'write-file-functions)
-         '(erc-save-buffer-in-logs))
@@ -245 +248 @@
-                     (move-marker erc-last-saved-position
-                                  (1- (point-max)))))))
+
+(defun erc-log-disable-logging ()
+  "Disable logging in the current buffer."
+  (when (erc-logging-enabled)
+    (setq buffer-offer-save nil
+          erc-enable-logging nil)))
-
-(defun erc-log-all-but-server-buffers (buffer)
@@ -283 +292 @@
-         erc-enable-logging)))
-
+(defun erc-log-standardize-name (filename)
+  "Make FILENAME safe to use as the name of an ERC log.
+This will not work with full paths, only names.
+
+Any unsafe characters in the name are replaced with \"!\".  The
+filename is downcased."
+  (downcase (erc-replace-regexp-in-string
+             "[/\\]" "!" (convert-standard-filename filename))))
+
-(defun erc-current-logfile (&optional buffer)
-  "Return the logfile to use for BUFFER.
@@ -289 +307 @@
-The result is converted to lowercase, as IRC is case-insensitive"
-  (expand-file-name
-
-
-
-
-
+
+
+
+
+
+
-   erc-log-channels-directory))
-