mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-27

Browse source 
d7f4cc0974 ERC: Track: Clarify documentation on tracked buffers and a...
fb1f0dfec9 ERC: Track: Fix documentation of structure of 'erc-modifie...
252a769b11 ; * doc/lispref/files.texi (Changing Files): Fix xref to f...
edc93a5ce6 ; Fix grammar in efaq.texi on Emacs vs XEmacs.

# Conflicts:
#	doc/misc/efaq.texi
This commit is contained in:
Amin Bandali 2021-09-11 23:03:57 -04:00
commit e4b7fa0500
No known key found for this signature in database
GPG key ID: 8B44A0CDC7B956F2
3 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/lispref/files.texi
View file

@ -1874,7 +1874,7 @@ Interactively, @var{mode} is read from the minibuffer using
@code{read-file-modes} (see below), which lets the user type in either
an integer or a string representing the permissions symbolically.
@xref{File Attributes}, for the function @code{file-modes}, which
@xref{Testing Accessibility}, for the function @code{file-modes}, which
returns the permissions of a file.
@end deffn

14
doc/misc/efaq.texi
View file

@ -1425,9 +1425,17 @@ of files from Macintosh, Microsoft, and Unix platforms.
@cindex XEmacs
XEmacs was a branch version of Emacs that is no longer actively
developed. XEmacs last released a new version on January 30, 2009,
and it lacks many important features that exist in Emacs. Since its
development has stopped, we do not expect to see any new releases.
developed. XEmacs was first called Lucid Emacs, and was initially
derived from a prerelease version of Emacs 19. In this FAQ, we use
the name ``Emacs'' only for the official version.
XEmacs last released a new version on January 30, 2009, and it lacks
many important features that exist in Emacs. In the past, it was not
uncommon for Emacs packages to include code for compatibility with
XEmacs. Nowadays, although some packages still maintain such
compatibility code, several of the more popular built-in and third
party packages have either stopped supporting XEmacs or were developed
exclusively for Emacs.
In the past, it was not uncommon for Emacs packages to include code
for compatibility with XEmacs. Nowadays, most built-in and third party

32
lisp/erc/erc-track.el
View file

@ -262,14 +262,22 @@ nil - don't add to mode line."
(defvar erc-modified-channels-alist nil
"An ALIST used for tracking channel modification activity.
Each element looks like (BUFFER COUNT FACE) where BUFFER is a buffer
object of the channel the entry corresponds to, COUNT is a number
indicating how often activity was noticed, and FACE is the face to use
when displaying the buffer's name. See `erc-track-faces-priority-list',
and `erc-track-showcount'.
Each element is a list of the form (BUFFER COUNT . FACE) where
BUFFER is a buffer object of the channel the entry corresponds
to, COUNT is a number indicating how often activity was noticed,
and FACE is a face (or a list of faces, combined as usual) to use
when displaying the buffer's name in the mode line.
Entries in this list should only happen for buffers where activity occurred
while the buffer was not visible.")
Entries in this list are only added/updated for buffers that were
not visible when activity occurred in them, and are removed for
each buffer as soon as it becomes visible again (or if the server
is disconnected, provided `erc-track-remove-disconnected-buffers'
is true).
For how the face is chosen for a buffer, see
`erc-track-find-face' and `erc-track-priority-faces-only'. For
how buffers are then displayed in the mode line, see
`erc-modified-channels-display'.")
(defcustom erc-track-showcount nil
"If non-nil, count of unseen messages will be shown for each channel."
@ -622,8 +630,14 @@ ARGS are ignored."
"The face to use when mouse is over channel names in the mode line.")
(defun erc-make-mode-line-buffer-name (string buffer &optional faces count)
"Return STRING as a button that switches to BUFFER when clicked.
If FACES are provided, color STRING with them."
"Returns a button that switches to BUFFER when clicked.
STRING is the string in the button. It is possibly suffixed with
the number of unread messages, according to variables
`erc-track-showcount' and `erc-track-showcount-string'.
If `erc-track-use-faces' is true and FACES are provided, format
STRING with them. When the mouse hovers above the button, STRING
is displayed according to `erc-track-mouse-face'."
;; We define a new sparse keymap every time, because 1. this data
;; structure is very small, the alternative would require us to
;; defvar a keymap, 2. the user is not interested in customizing it