Mercurial > emacs

changeset 82121:4b32c8c81cd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Miles Bader <miles@gnu.org>
date Thu, 26 Jul 2007 05:18:50 +0000
parents cb9f54321c74 (current diff) 9510a7231ed7 (diff)
children bf5541c35cb3
files
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/filelock.c	Thu Jul 26 05:18:03 2007 +0000
+++ b/src/filelock.c	Thu Jul 26 05:18:50 2007 +0000
@@ -6,7 +6,7 @@
 
 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 @@
     }
 
   /* 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)
     {