|
65 | 65 | (with-temp-buffer
|
66 | 66 | (insert-buffer cur-buffer)
|
67 | 67 | (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)) |
70 | 69 | (goto-char (point-max))
|
71 | 70 | (search-backward "ERC> ")
|
72 | 71 | (delete-region (line-beginning-position) (line-end-position))
|
|
131 | 130 | (erc-logger-write-file-immut file-full-path))
|
132 | 131 | (when (not (= end-of-message-point current-message-point))
|
133 | 132 | (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 |
140 | 136 | (setq-local inhibit-read-only nil))
|
141 | 137 | (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*))) |
144 | 143 | (if (string= *erc-logger-log-todays-date* (format-time-string "%Y-%m-%d"))
|
145 | 144 | (save-buffer-graceful)
|
146 | 145 |
|
147 | 146 | ;; compress log files and mv them to another directory on next day
|
148 | 147 | ;; 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."))) |
170 | 170 | )))))
|
171 | 171 | (unless (string= *erc-logger-log-todays-date* (format-time-string "%Y-%m-%d"))
|
172 | 172 | (setq *erc-logger-log-todays-date* (format-time-string "%Y-%m-%d"))))
|
|
0 commit comments