Commit c49e36e6 authored by Eli Zaretskii's avatar Eli Zaretskii

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

parents fc3ba91a 8cd2eee7
Pipeline #3357 passed with stage
in 62 minutes and 31 seconds
...@@ -104,17 +104,17 @@ Possible choices are nil (use default methods), `anonymous', ...@@ -104,17 +104,17 @@ Possible choices are nil (use default methods), `anonymous',
(defvoo nnimap-expunge 'on-exit (defvoo nnimap-expunge 'on-exit
"When to expunge deleted messages. "When to expunge deleted messages.
If 'never, deleted articles are marked with the IMAP \\Delete If `never', deleted articles are marked with the IMAP \\Delete
flag but not automatically expunged. If 'immediately, deleted flag but not automatically expunged. If `immediately', deleted
articles are immediately expunged (this requires the server to articles are immediately expunged (this requires the server to
support the UID EXPUNGE command). If 'on-exit, deleted articles support the UID EXPUNGE command). If `on-exit', deleted articles
are flagged, and all flagged articles are expunged when the are flagged, and all flagged articles are expunged when the group
group is closed. is closed.
For backwards compatibility, this variable may also be set to t For backwards compatibility, this variable may also be set to t
or nil. If the server supports UID EXPUNGE, both t and nil are or nil. If the server supports UID EXPUNGE, both t and nil are
equivalent to 'immediately. If the server does not support UID equivalent to `immediately'. If the server does not support UID
EXPUNGE nil is equivalent to 'never, while t will immediately EXPUNGE nil is equivalent to `never', while t will immediately
expunge ALL articles that are currently flagged as deleted expunge ALL articles that are currently flagged as deleted
(i.e., potentially not only the article that was just deleted).") (i.e., potentially not only the article that was just deleted).")
......
...@@ -317,7 +317,7 @@ directory, like `default-directory'." ...@@ -317,7 +317,7 @@ directory, like `default-directory'."
string)) string))
(defcustom ibuffer-help-buffer-modes (defcustom ibuffer-help-buffer-modes
'(help-mode apropos-mode Info-mode Info-edit-mode) '(help-mode apropos-mode Info-mode)
"List of \"Help\" major modes." "List of \"Help\" major modes."
:type '(repeat function)) :type '(repeat function))
......
...@@ -78,6 +78,11 @@ This feature will be removed in future.") ...@@ -78,6 +78,11 @@ This feature will be removed in future.")
(buffer-modified-p) (buffer-modified-p)
(message "Tags may have changed. Use Info-tagify if necessary"))) (message "Tags may have changed. Use Info-tagify if necessary")))
;; Moved here from definition of ibuffer-help-buffer-modes to make
;; that variable customizable even though this code is obsolete. See
;; also Bug#30990.
(add-to-list 'ibuffer-help-buffer-modes 'Info-edit-mode)
(provide 'info-edit) (provide 'info-edit)
;;; info-edit.el ends here ;;; info-edit.el ends here
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment