diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-06-26 07:51:01 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-06-26 07:51:01 -0700 |
| commit | 513b97c0e94f5c25dd9ac82aea86c9eba248589d (patch) | |
| tree | 08bfa10e294e43635ec5e03a375ae0837de5040f /doc/emacs | |
| parent | 61f73703c74756e6963cc622f03bcc6938ab71b2 (diff) | |
| parent | 12c77f6918c4a60dbbae3f716a58300b4026e8da (diff) | |
| download | emacs-513b97c0e94f5c25dd9ac82aea86c9eba248589d.tar.gz emacs-513b97c0e94f5c25dd9ac82aea86c9eba248589d.tar.bz2 emacs-513b97c0e94f5c25dd9ac82aea86c9eba248589d.zip | |
Merge from origin/emacs-26
12c77f6 (origin/emacs-26) Add ido-fallback special variable (Bug#31707)
826e8d1 Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
c784876 Tighten a cross-reference in documentation
517dc0b Fix last change in tramp-sh.el
f43186f Revert previous patch; comment was OK after all.
4c3306e Fix lead comment for count_trailing_zero_bits
b419f27 ; * doc/emacs/files.texi (Interlocking): Fix a non-portable @...
7488de4 * lisp/emacs-lisp/regexp-opt.el (regexp-opt): Fix docstring q...
0b69807 Make a minor update to the CSS mode docstring
9a53b6d Say how to override a primitive interactive spec
1d77078 Fix Bug#31941
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/files.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index f902baee9c2..f0a11fde555 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -779,7 +779,7 @@ visiting a file, Emacs records that the file is @dfn{locked} by you. (It does this by creating a specially-named symbolic link@footnote{If your file system does not support symbolic links, a regular file is used.} with special contents in the same directory. @xref{File -Locks,,, elisp} for more details.) Emacs removes the lock when you +Locks,,, elisp}, for more details.) Emacs removes the lock when you save the changes. The idea is that the file is locked whenever an Emacs buffer visiting it has unsaved changes. |