From: Glenn Morris <rgm@gnu.org>
Date: Fri, 8 Feb 2008 08:33:42 +0000 (+0000)
Subject: (x-handle-parent-id): Remove free variable `parent-id'.
X-Git-Tag: emacs-pretest-23.0.90~8091
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9c7b08c6e7bc5f0b271aa4a60e76fcd1a9507a3;p=emacs.git

(x-handle-parent-id): Remove free variable `parent-id'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b5790b2010..c743c917eb1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -23,6 +23,8 @@
 	(pcmpl-ssh-hosts): Move definition before use.  Handle lines
 	without hostnames, and multiple hostnames per line.
 
+	* term/x-win.el (x-handle-parent-id): Remove free variable `parent-id'.
+
 2008-02-08  Phil Hagelberg <phil@evri.com>
 
 	* pcmpl-unix.el (pcmpl-ssh-known-hosts-file): New defcustom.
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 5ce1a03ddcc..acbb3161a15 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -194,10 +194,11 @@
 (defun x-handle-parent-id (switch)
   (or (consp x-invocation-args)
       (error "%s: missing argument to `%s' option" (invocation-name) switch))
-  (setq parent-id (string-to-number (car x-invocation-args))
-	x-invocation-args (cdr x-invocation-args))
-  (setq initial-frame-alist (cons (cons 'parent-id parent-id)
-				  initial-frame-alist)))
+  (setq initial-frame-alist (cons
+                             (cons 'parent-id
+                                   (string-to-number (car x-invocation-args)))
+                             initial-frame-alist)
+        x-invocation-args (cdr x-invocation-args)))
 
 (defvar x-display-name nil
   "The name of the X display on which Emacs was started.