diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:02:03 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-04 15:02:03 -0700 |
| commit | ae0a1a890ec7b885e85cd945a21ca42fed80df3d (patch) | |
| tree | 495f1d851cb3a43a0e677bff9c09d4211a35fbde /doc/lispref | |
| parent | 66b5222c3cd72839bf72e0b2a03912719c930451 (diff) | |
| parent | acae275b2752357497a2411876b83240ce7c8aec (diff) | |
| download | emacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.tar.gz emacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.tar.bz2 emacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.zip | |
Merge from origin/emacs-25
acae275 ; Spelling fixes
d8fac73 Update README for precompiled windows Emacs.
23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks
f708cb2 Clarify doc string of 'transpose-sexps'
cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab'
bdc89eb Improve documentation of 'font-lock-remove-keywords'
4a0c590 Fix documentation of the command summary key
0221b7a Mark relocation workarounds with REL_ALLOC
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/files.texi | 15 | ||||
| -rw-r--r-- | doc/lispref/modes.texi | 4 |
2 files changed, 18 insertions, 1 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index ecc3e03967c..cb31ca5a3de 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1148,6 +1148,21 @@ compares the truenames of the two directories. If @var{dir} does not name an existing directory, the return value is @code{nil}. @end defun +@defun vc-responsible-backend file +This function determines the responsible VC backend of the given +@var{file}. For example, if @file{emacs.c} is a file tracked by Git, +@w{@code{(vc-responsible-backend "emacs.c")}} returns @samp{Git}. +Note that if @var{file} is a symbolic link, +@code{vc-responsible-backend} will not resolve it---the backend of the +symbolic link file itself is reported. To get the backend VC of the +file to which @var{file} refers, wrap @var{file} with a symbolic link +resolving function such as @code{file-chase-links}: + +@smallexample +(vc-responsible-backend (file-chase-links "emacs.c")) +@end smallexample +@end defun + @node File Attributes @subsection File Attributes @cindex file attributes diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 368d882a4b8..c7b6106ef5b 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -2934,7 +2934,9 @@ This function removes @var{keywords} from @code{font-lock-keywords} for the current buffer or for major mode @var{mode}. As in @code{font-lock-add-keywords}, @var{mode} should be a major mode command name or @code{nil}. All the caveats and requirements for -@code{font-lock-add-keywords} apply here too. +@code{font-lock-add-keywords} apply here too. The argument +@var{keywords} must exactly match the one used by the corresponding +@code{font-lock-add-keywords}. @end defun For example, the following code adds two fontification patterns for C |