From: Glenn Morris <rgm@gnu.org>
Date: Tue, 15 Sep 2009 07:09:17 +0000 (+0000)
Subject: Revert unnecessary parts of previous change.
X-Git-Tag: emacs-pretest-23.1.90~1303
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4f6cc6b5312b4aaa2b790737c4f3074c4c027042;p=emacs.git

Revert unnecessary parts of previous change.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index a60ba03ce6b..e7e988d367c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2071,14 +2071,14 @@ A fancy display is used on graphic displays, normal otherwise."
 	    (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 @@ A fancy display is used on graphic displays, normal otherwise."
 		     (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)))