diff options
| author | Miles Bader | 2007-07-26 05:18:50 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-26 05:18:50 +0000 |
| commit | c07bb40b73856e3c40daf1dc6007ea13e3870912 (patch) | |
| tree | a98540d6ac5984bf3c5810c7530c974b60fde275 /src | |
| parent | 4382021fc15f8a52c9dd12bacb7c75dbeb562302 (diff) | |
| parent | ef2805c29bb03f0c8c0d4b37a65f511123dcab1c (diff) | |
| download | emacs-c07bb40b73856e3c40daf1dc6007ea13e3870912.tar.gz emacs-c07bb40b73856e3c40daf1dc6007ea13e3870912.zip | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 70-73)
- Update from CVS
2007-07-25 Glenn Morris <rgm@gnu.org>
* Relicense all FSF files to GPLv3 or later.
2007-07-23 Jason Rumney <jasonr@gnu.org>
* src/filelock.c (current_lock_owner): Allow for @ sign in username.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
Diffstat (limited to 'src')
| -rw-r--r-- | src/filelock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/filelock.c b/src/filelock.c index 689a80a4209..4c211bf9947 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -6,7 +6,7 @@ This file is part of GNU Emacs. | |||
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify | 7 | GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 2, or (at your option) | 9 | the Free Software Foundation; either version 3, or (at your option) |
| 10 | any later version. | 10 | any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 12 | GNU Emacs is distributed in the hope that it will be useful, |
| @@ -468,8 +468,8 @@ current_lock_owner (owner, lfname) | |||
| 468 | } | 468 | } |
| 469 | 469 | ||
| 470 | /* Parse USER@HOST.PID:BOOT_TIME. If can't parse, return -1. */ | 470 | /* Parse USER@HOST.PID:BOOT_TIME. If can't parse, return -1. */ |
| 471 | /* The USER is everything before the first @. */ | 471 | /* The USER is everything before the last @. */ |
| 472 | at = index (lfinfo, '@'); | 472 | at = rindex (lfinfo, '@'); |
| 473 | dot = rindex (lfinfo, '.'); | 473 | dot = rindex (lfinfo, '.'); |
| 474 | if (!at || !dot) | 474 | if (!at || !dot) |
| 475 | { | 475 | { |