[Emacs-diffs] master c49e36e 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit c49e36e67e127417782770d63afc378cd232344e
Merge: fc3ba91 8cd2eee
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 lisp/gnus/nnimap.el        | 14 +++++++-------
 lisp/ibuffer.el            |  2 +-
 lisp/obsolete/info-edit.el |  5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 2c91ba0..8393998 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -104,17 +104,17 @@ Possible choices are nil (use default methods), 
`anonymous',
 
 (defvoo nnimap-expunge 'on-exit
   "When to expunge deleted messages.
-If 'never, deleted articles are marked with the IMAP \\Delete
-flag but not automatically expunged. If 'immediately, deleted
+If `never', deleted articles are marked with the IMAP \\Delete
+flag but not automatically expunged. If `immediately', deleted
 articles are immediately expunged (this requires the server to
-support the UID EXPUNGE command). If 'on-exit, deleted articles
-are flagged, and all flagged articles are expunged when the
-group is closed.
+support the UID EXPUNGE command). If `on-exit', deleted articles
+are flagged, and all flagged articles are expunged when the group
+is closed.
 
 For backwards compatibility, this variable may also be set to t
 or nil. If the server supports UID EXPUNGE, both t and nil are
-equivalent to 'immediately. If the server does not support UID
-EXPUNGE nil is equivalent to 'never, while t will immediately
+equivalent to `immediately'. If the server does not support UID
+EXPUNGE nil is equivalent to `never', while t will immediately
 expunge ALL articles that are currently flagged as deleted
 (i.e., potentially not only the article that was just deleted).")
 
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 3af06eb..c81b05e 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -317,7 +317,7 @@ directory, like `default-directory'."
                  string))
 
 (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."
   :type '(repeat function))
 
diff --git a/lisp/obsolete/info-edit.el b/lisp/obsolete/info-edit.el
index b64e840..55c52b5 100644
--- a/lisp/obsolete/info-edit.el
+++ b/lisp/obsolete/info-edit.el
@@ -78,6 +78,11 @@ This feature will be removed in future.")
        (buffer-modified-p)
        (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)
 
 ;;; info-edit.el ends here