diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:43:17 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:43:17 -0700 |
| commit | 6129cd03e20a0aaee46ceb742a9ed1ae2904eab3 (patch) | |
| tree | f432bbffba80979cec74cfc125a9f73abfd06a91 /src/filelock.c | |
| parent | 16d126d7559c2f58c8af6cf86c9f54b6e21cceb4 (diff) | |
| parent | b73f4668ab685dfb690eced15b20ed47f90efccb (diff) | |
| download | emacs-6129cd03e20a0aaee46ceb742a9ed1ae2904eab3.tar.gz | |
Merge from origin/emacs-25
b73f466 * lisp/cus-start.el (exec-path): Handle nil elements. (Bug#2...
55ebb70 Catch the imenu-unavailable error in sh-mode completion table
993acb5 ; Minor fix for last change in characters.el
30c4bb5 More char-width fixes
4eb4463 Fix char-width-table values for some Emoji
528997d Keep point when switching from and to *terminal* buffer
2130005 * INSTALL: Use correct Emacs release number 25.
10835b1 Avoid crashes due to objects read with the #n=object form
4de671d Improve doc string of 'completion-at-point-functions'
ceb46f0 Fix crash in evaluating functions
d8374c4 * src/filelock.c (current_lock_owner): Update comment.
Diffstat (limited to 'src/filelock.c')
| -rw-r--r-- | src/filelock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/filelock.c b/src/filelock.c index d4dfc1dd007..a4b742abb5d 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -565,10 +565,10 @@ current_lock_owner (lock_info_type *owner, char *lfname) break; case '\357': - /* Treat "\357\200\242" (U+F022 in UTF-8) as if it were ":". - This works around a bug in Samba, which can mistakenly - transliterate ':' to U+F022 in symlink contents (Bug#24656). - See <https://bugzilla.redhat.com/show_bug.cgi?id=1271407#c8>. */ + /* Treat "\357\200\242" (U+F022 in UTF-8) as if it were ":" (Bug#24656). + This works around a bug in the Linux CIFS kernel client, which can + mistakenly transliterate ':' to U+F022 in symlink contents. + See <https://bugzilla.redhat.com/show_bug.cgi?id=1384153>. */ if (! (boot[0] == '\200' && boot[1] == '\242')) return -1; boot += 2; |