Skip to content

Commit 941ae51

Browse files
committed
Fix saving log files to `*erc-logger-log-other-direcotry*' with incorrect date
Also fixed the lack of update of variable `end-of-message-point' which caused errors while saving or appending to files. Removed unnecessary funcall of `(remove-text-properties)'.
1 parent 6aa68f8 commit 941ae51

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

erc-logger.el

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@
6565
(with-temp-buffer
6666
(insert-buffer cur-buffer)
6767
(unless inhibit-read-only
68-
(setq-local inhibit-read-only t)
69-
(remove-text-properties (point-min) (point-max) 'read-only))
68+
(setq-local inhibit-read-only t))
7069
(goto-char (point-max))
7170
(search-backward "ERC> ")
7271
(delete-region (line-beginning-position) (line-end-position))
@@ -131,42 +130,43 @@
131130
(erc-logger-write-file-immut file-full-path))
132131
(when (not (= end-of-message-point current-message-point))
133132
(puthash erc-buffer end-of-message-point *erc-logger-irc-buffer-size-map*)))
134-
(buffer-read-write
135-
()
136-
(setq-local inhibit-read-only t)
137-
(remove-text-properties (point-min) (point-max) 'read-only))
138-
(buffer-read-only
139-
()
133+
(buffer-read-write nil
134+
(setq-local inhibit-read-only t))
135+
(buffer-read-only nil
140136
(setq-local inhibit-read-only nil))
141137
(clear-previous-days-messages
142-
()
143-
(delete-region (point-min) end-of-message-point)))
138+
nil
139+
(delete-region (point-min) current-message-point)
140+
(setq end-of-message-point (erc-logger-end-of-messages)
141+
current-message-point end-of-message-point)
142+
(puthash erc-buffer end-of-message-point *erc-logger-irc-buffer-size-map*)))
144143
(if (string= *erc-logger-log-todays-date* (format-time-string "%Y-%m-%d"))
145144
(save-buffer-graceful)
146145

147146
;; compress log files and mv them to another directory on next day
148147
;; and clear the buffer, save to new files
149-
(progn (save-buffer-graceful)
150-
(buffer-read-write)
151-
(clear-previous-days-messages)
152-
(buffer-read-only)
153-
(if (directory-name-p *erc-logger-log-other-directory*)
154-
(let* ((dir-name (concat *erc-logger-log-other-directory*
155-
(format-time-string "%Y-%m-%d") "/")))
156-
(cl-flet ((transfer-file ()
157-
(rename-file file-full-path dir-name t)
158-
(unless
159-
(= 0 (shell-command
160-
(concat "gzip -9f "
161-
dir-name
162-
file-name)))
163-
(message "failed to compress file!"))))
164-
(if (file-exists-p dir-name)
165-
(transfer-file)
166-
(progn (make-directory dir-name)
167-
(when (file-exists-p dir-name)
168-
(transfer-file))))))
169-
(error "Invalid directory name, please set variable `*erc-logger-log-other-directory*' properly.")))
148+
(progn
149+
(buffer-read-write)
150+
(clear-previous-days-messages)
151+
(buffer-read-only)
152+
(save-buffer-graceful)
153+
(if (directory-name-p *erc-logger-log-other-directory*)
154+
(let* ((dir-name (file-name-as-directory (concat *erc-logger-log-other-directory*
155+
*erc-logger-log-todays-date*))))
156+
(cl-flet ((transfer-file ()
157+
(rename-file file-full-path dir-name t)
158+
(unless
159+
(= 0 (shell-command
160+
(concat "gzip -9f "
161+
dir-name
162+
file-name)))
163+
(message "failed to compress file!"))))
164+
(if (file-exists-p dir-name)
165+
(transfer-file)
166+
(progn (make-directory dir-name)
167+
(when (file-exists-p dir-name)
168+
(transfer-file))))))
169+
(error "Invalid directory name, please set variable `*erc-logger-log-other-directory*' properly.")))
170170
)))))
171171
(unless (string= *erc-logger-log-todays-date* (format-time-string "%Y-%m-%d"))
172172
(setq *erc-logger-log-todays-date* (format-time-string "%Y-%m-%d"))))

0 commit comments

Comments
 (0)