Commit c07bb40b authored by Miles Bader's avatar Miles Bader
Browse files

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
parents 4382021f ef2805c2
......@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
......@@ -468,8 +468,8 @@ current_lock_owner (owner, lfname)
}
/* Parse USER@HOST.PID:BOOT_TIME. If can't parse, return -1. */
/* The USER is everything before the first @. */
at = index (lfinfo, '@');
/* The USER is everything before the last @. */
at = rindex (lfinfo, '@');
dot = rindex (lfinfo, '.');
if (!at || !dot)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment