# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1252998557 0
# Node ID 683744add5c633de4cfaa80bad2b4fdeab56170d
# Parent  65e1f1ec8586bc4e76ac32b6a52c877a2b37c909
Revert unnecessary parts of previous change.

diff -r 65e1f1ec8586 -r 683744add5c6 lisp/startup.el
--- a/lisp/startup.el	Tue Sep 15 07:06:04 2009 +0000
+++ b/lisp/startup.el	Tue Sep 15 07:09:17 2009 +0000
@@ -2071,14 +2071,14 @@
 	    (cl1-column 0))
 
 	;; Add the long X options to longopts.
-	(dolist (cl1-tem command-line-x-option-alist)
-	  (if (string-match "^--" (car cl1-tem))
-            (push (car cl1-tem) longopts)))
+	(dolist (tem command-line-x-option-alist)
+	  (if (string-match "^--" (car tem))
+            (push (car tem) longopts)))
 
 	;; Add the long NS options to longopts.
-	(dolist (cl1-tem command-line-ns-option-alist)
-	  (if (string-match "^--" (car cl1-tem))
-	      (push (list (car cl1-tem)) longopts)))
+	(dolist (tem command-line-ns-option-alist)
+	  (if (string-match "^--" (car tem))
+	      (push (list (car tem)) longopts)))
 
 	;; Loop, processing options.
 	(while command-line-args-left
@@ -2202,7 +2202,8 @@
 		     (error "File name omitted from `%s' option" argi))
 		   (setq file-count (1+ file-count))
 		   (let ((file (expand-file-name
-				(command-line-normalize-file-name cl1-tem) cl1-dir)))
+				(command-line-normalize-file-name cl1-tem)
+				cl1-dir)))
 		     (if (= file-count 1)
 			 (setq first-file-buffer (find-file file))
 		       (find-file-other-window file)))