Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c49e36e6
Commit
c49e36e6
authored
Sep 28, 2019
by
Eli Zaretskii
Browse files
Options
Browse Files
Download
Plain Diff
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
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
lisp/gnus/nnimap.el
lisp/gnus/nnimap.el
+7
-7
lisp/ibuffer.el
lisp/ibuffer.el
+1
-1
lisp/obsolete/info-edit.el
lisp/obsolete/info-edit.el
+5
-0
No files found.
lisp/gnus/nnimap.el
View file @
c49e36e6
...
...
@@ -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)."
)
...
...
lisp/ibuffer.el
View file @
c49e36e6
...
...
@@ -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
))
...
...
lisp/obsolete/info-edit.el
View file @
c49e36e6
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment