mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 11:50:51 -08:00
Code Issues Projects Releases Wiki Activity

Don't create directory in erc-truncate compat check

Browse source 
* lisp/erc/erc-log.el (erc-log--check-writable-nocreate-p): New variable.
(erc-logging-enabled): Use `erc-log--save-in-progress-p' flag to
conditionally avoid creating a directory when checking if the location
is writable.
(erc-log--call-when-logging-enabled-sans-module)
(erc-log--check-legacy-implicit-enabling-by-truncate): Rename former to
latter, and guard against creating a ~/log directory just to see if it's
writable when calling `erc-logging-enabled'.
(erc-truncate-mode): Explain legacy "implicit logging" behavior in doc
string.
* lisp/erc/erc-truncate.el (erc-truncate--warn-about-logging): Make more
concise, and defer to `erc-truncate-mode' doc string for particulars.
* lisp/erc/erc.el (erc-directory-writable-p): Add comment to rename on
next non-patch release.
This commit is contained in:
F. Jason Park 2024-09-30 02:10:02 -07:00
parent 3f1ce47fe7
commit 1de2c86317
3 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lisp/erc/erc-log.el
View file

@ -307,6 +307,10 @@ Return nil if BUFFER is a server buffer."
(erc-save-buffer-in-logs buffer)))
(defvar erc-log--save-in-progress-p nil)
;; The function `erc-directory-writable-p' may signal when HOME is not
;; writable, such as when running the test suite (/nonexistent). This
;; flag tells `erc-logging-enabled' to use `file-writable-p' instead.
(defvar erc-log--check-writable-nocreate-p nil)
;;;###autoload
(defun erc-logging-enabled (&optional buffer)
@ -319,7 +323,9 @@ is writable (it will be created as necessary) and
(and erc-log-channels-directory
(not erc-log--save-in-progress-p)
(or (functionp erc-log-channels-directory)
(erc-directory-writable-p erc-log-channels-directory))
(if erc-log--check-writable-nocreate-p
(file-writable-p erc-log-channels-directory)
(erc-directory-writable-p erc-log-channels-directory)))
(if (functionp erc-enable-logging)
(funcall erc-enable-logging buffer)
(buffer-local-value 'erc-enable-logging buffer))))
@ -452,14 +458,14 @@ You can save every individual message by putting this function on
(defun erc-log--save-on-clear (_ end)
(erc-save-buffer-in-logs end))
;; This is a kludge to avoid littering erc-truncate.el with forward
;; declarations needed only for a corner-case compatibility check.
(defun erc-log--call-when-logging-enabled-sans-module (fn)
(when (and (erc-logging-enabled)
(not (or erc-log-mode (memq 'log erc-modules))))
(let ((dirfile (and (stringp erc-log-channels-directory)
erc-log-channels-directory)))
(funcall fn dirfile))))
;; This exists to avoid littering erc-truncate.el with forward
;; declarations needed only for a compatibility check.
(defun erc-log--check-legacy-implicit-enabling-by-truncate ()
"Return non-nil when conditions for legacy \"implicit\" activation are met.
This only concerns the \\+`truncate' module."
(and (not (or erc-log-mode (memq 'log erc-modules)))
(let ((erc-log--check-writable-nocreate-p t))
(erc-logging-enabled))))
(provide 'erc-log)