diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/eudc-vars.el | 8 | ||||
| -rw-r--r-- | lisp/net/eudc.el | 24 |
2 files changed, 24 insertions, 8 deletions
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el index dea17f34247..bb1f9d9f0f3 100644 --- a/lisp/net/eudc-vars.el +++ b/lisp/net/eudc-vars.el @@ -343,9 +343,15 @@ arguments that should be passed to the program." :inline t (string :tag "Argument"))))) +(defcustom eudc-ignore-options-file nil + "Ignore configuration in `eudc-options-file', if non-nil." + :type 'boolean + :version "29.1") + (defcustom eudc-options-file (locate-user-emacs-file "eudc-options" ".eudc-options") - "A file where the `servers' hotlist is stored." + "A file where the `servers' hotlist is stored. +See `eudc-ignore-options-file'." :type '(file :Tag "File Name:") :version "25.1") diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index 5f9e78fc7f3..8319c048e20 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -726,7 +726,8 @@ server for future sessions." (if (called-interactively-p 'interactive) (message "Current directory server is now %s (%s)" eudc-server eudc-protocol)) (if (null no-save) - (eudc-save-options))) + (when (not eudc-ignore-options-file) + (eudc-save-options)))) ;;;###autoload (defun eudc-get-email (name &optional error) @@ -1107,7 +1108,11 @@ queries the server for the existing fields and displays a corresponding form." (error "%s:%s is already in the hotlist" protocol server) (setq eudc-server-hotlist (cons (cons server protocol) eudc-server-hotlist)) (eudc-install-menu) - (eudc-save-options))) + (if eudc-ignore-options-file + (warn "Not saving bookmark due to `eudc-ignore-options-file'\ + customization. Instead, customize `eudc-server-hotlist' to include %s:%s" + protocol server) + (eudc-save-options)))) (defun eudc-bookmark-current-server () "Add current server to the EUDC `servers' hotlist." @@ -1117,6 +1122,9 @@ queries the server for the existing fields and displays a corresponding form." (defun eudc-save-options () "Save options to `eudc-options-file'." (interactive) + (when eudc-ignore-options-file + (error "EUDC is configured to ignore the deprecated options file;\ + see `eudc-ignore-options-file'")) (with-current-buffer (find-file-noselect eudc-options-file t) (goto-char (point-min)) ;; delete the previous setq @@ -1278,11 +1286,13 @@ queries the server for the existing fields and displays a corresponding form." ;;{{{ Load time initializations ;; Load the options file -(if (and (not noninteractive) - (and (locate-library eudc-options-file) - (progn (message "") t)) ; Remove mode line message - (not (featurep 'eudc-options-file))) - (load eudc-options-file)) +(let ((library-file-path (locate-library eudc-options-file))) + (if (and (not noninteractive) + (and library-file-path + (progn (message "") t)) ; Remove mode line message + (not (featurep 'eudc-options-file)) + (not eudc-ignore-options-file)) + (load eudc-options-file))) ;; Install the full menu (unless (featurep 'infodock) |