mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-28

Browse source 
917da2641e Minor doc fix; improve sorting of VC backends
89695bce3e Clarify the doc string of 'set-face-attribute'
This commit is contained in:
Stefan Kangas 2022-09-02 23:57:18 +02:00
commit e96acb1007
2 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

48
doc/emacs/maintaining.texi
View file

@ -170,6 +170,30 @@ which it refers to as @dfn{back ends}:
@itemize @bullet
@cindex git
@item
Git is a decentralized version control system originally invented by
Linus Torvalds to support development of Linux (his kernel). VC
supports many common Git operations, but others, such as repository
syncing, must be done from the command line.
@cindex CVS
@item
CVS is the free version control system that was, until circa 2008,
used by the majority of free software projects. Since then, it has
been superseded by newer systems. CVS allows concurrent multi-user
development either locally or over the network. Unlike newer systems,
it lacks support for atomic commits and file moving/renaming. VC
supports all basic editing operations under CVS.
@cindex SVN
@cindex Subversion
@item
Subversion (svn) is a free version control system designed to be
similar to CVS but without its problems (e.g., it supports atomic
commits of filesets, and versioning of directories, symbolic links,
meta-data, renames, copies, and deletes).
@cindex SCCS
@item
SCCS was the first version control system ever built, and was long ago
@ -191,30 +215,6 @@ built. It is relatively primitive: it cannot be used over the
network, and works at the level of individual files. Almost
everything you can do with RCS can be done through VC.
@cindex CVS
@item
CVS is the free version control system that was, until circa 2008,
used by the majority of free software projects. Since then, it has
been superseded by newer systems. CVS allows concurrent multi-user
development either locally or over the network. Unlike newer systems,
it lacks support for atomic commits and file moving/renaming. VC
supports all basic editing operations under CVS.
@cindex SVN
@cindex Subversion
@item
Subversion (svn) is a free version control system designed to be
similar to CVS but without its problems (e.g., it supports atomic
commits of filesets, and versioning of directories, symbolic links,
meta-data, renames, copies, and deletes).
@cindex git
@item
Git is a decentralized version control system originally invented by
Linus Torvalds to support development of Linux (his kernel). VC
supports many common Git operations, but others, such as repository
syncing, must be done from the command line.
@cindex hg
@cindex Mercurial
@item

33
lisp/faces.el
View file

@ -666,21 +666,28 @@ If FACE is a face-alias, get the documentation for the target face."
(defun set-face-attribute (face frame &rest args)
"Set attributes of FACE on FRAME from ARGS.
This function overrides the face attributes specified by FACE's
face spec. It is mostly intended for internal use only.
This function overrides the face attributes specified by FACE's face spec.
It is mostly intended for internal use.
If FRAME is nil, set the attributes for all existing frames, as
well as the default for new frames. If FRAME is t, change the
default for new frames only. As an exception, to reset the value
of some attribute to `unspecified' in a way that overrides the
non-`unspecified' value defined by the face's spec in `defface',
for new frames, you must explicitly call this function with FRAME
set to t and the attribute's value set to `unspecified'; just
using FRAME of nil will not affect new frames in this case.
If FRAME is a frame, set the FACE's attributes only for that frame. If
FRAME is nil, set attribute values for all existing frames, as well as
the default for new frames. If FRAME is t, change the default values
of attributes for new frames.
ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a
valid face attribute name. All attributes can be set to
`unspecified'; this fact is not further mentioned below.
ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a valid face
attribute name and VALUE must be a value that is valid for ATTRIBUTE,
as described below for each attribute.
In addition to the attribute values listed below, all attributes can
also be set to the special value `unspecified', which means the face
doesn't by itself specify a value for the attribute.
When a new frame is created, attribute values in the FACE's `defface'
spec normally override the `unspecified' values in the FACE's
default attributes. To avoid that, i.e. to cause ATTRIBUTE's value
be reset to `unspecified' when creating new frames, disregarding
what the FACE's face spec says, call this function with FRAME set to
t and the ATTRIBUTE's value set to `unspecified'.
The following attributes are recognized: