diff options
author | Glenn Morris <rgm@gnu.org> | 2018-02-28 09:40:40 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-02-28 09:40:40 -0800 |
commit | 3959892419eff45a7006deceddcc1962fdbcc1c9 (patch) | |
tree | 315d0425dad9a5b89a4c881102241fbab9f45c94 /doc/lispref/files.texi | |
parent | 51537b9e4937d7853647871dc264f0be9412a9fa (diff) | |
parent | fd5023874872dcb559cb7acdca6b019273c9de07 (diff) | |
download | emacs-3959892419eff45a7006deceddcc1962fdbcc1c9.tar.gz |
Merge from origin/emacs-26
fd50238 (origin/emacs-26) * doc/lispref/streams.texi (Output Variable...
769ea57 Use "GTK+" where applicable in the manual
5e69219 Document print-escape-control-characters
c00fea9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
a2ab0d0 * doc/emacs/killing.texi (Rectangles): Don't use @key for cha...
6288c3d * lisp/emulation/viper.el: Unbreak it.
bf3535e More fixes in the Emacs manual
c87d04e Avoid aborts in 'md5'
9743f48 Mark keys consistently in manuals
ce557a9 Remove @key{} markups from @kindex entries in manuals
71243f0 * doc/emacs/display.texi (Standard Faces): Fix markup of inde...
7a069f3 Fix @kindex entries in manuals
6218933 Fix @cindex entries in manuals
57c9f12 Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
e415309 Fix @cindex entries in org.texi
560a23e Document reserved keys
105d085 * doc/misc/ebrowse.texi: Use @key{} for keys.
Conflicts:
doc/misc/tramp.texi
etc/NEWS
Diffstat (limited to 'doc/lispref/files.texi')
-rw-r--r-- | doc/lispref/files.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 9fbdb628205..3a39826761c 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -3267,7 +3267,7 @@ shown above; the details are crucial for proper behavior in the case of multiple handlers, and for operations that have two file names that may each have handlers. -@kindex safe-magic (@r{property}) +@kindex safe-magic @r{(property)} Handlers that don't really do anything special for actual access to the file---such as the ones that implement completion of host names for remote file names---should have a non-@code{nil} @code{safe-magic} @@ -3277,7 +3277,7 @@ file names, by prefixing them with @samp{/:}. But if the handler that would be used for them has a non-@code{nil} @code{safe-magic} property, the @samp{/:} is not added. -@kindex operations (@r{property}) +@kindex operations @r{(property)} A file name handler can have an @code{operations} property to declare which operations it handles in a nontrivial way. If this property has a non-@code{nil} value, it should be a list of |