aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-07-21 17:23:14 +0000
committerDan Nicolaescu2008-07-21 17:23:14 +0000
commit3000e3f4e49db898c4f7a6ec702f351ed9c4c38a (patch)
tree9bb31cf4f16fc54ec114ff905e3cadd5e0a02a83
parentd221466a1d7c57c1b84b8e2568ba02b821d7c08a (diff)
downloademacs-3000e3f4e49db898c4f7a6ec702f351ed9c4c38a.tar.gz
emacs-3000e3f4e49db898c4f7a6ec702f351ed9c4c38a.zip
(command-line-1): Fix indentation.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/startup.el8
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7980e988f20..17ad3fb9e1b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12008-07-21 Dan Nicolaescu <dann@ics.uci.edu> 12008-07-21 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * startup.el (command-line-1): Fix indentation.
4
3 * term/ns-win.el (up-one, down-one, left-one, right-one): Remove, 5 * term/ns-win.el (up-one, down-one, left-one, right-one): Remove,
4 checked in inadvertently. 6 checked in inadvertently.
5 7
diff --git a/lisp/startup.el b/lisp/startup.el
index 6fdab938cf9..21ef966f185 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2205,10 +2205,10 @@ A fancy display is used on graphic displays, normal otherwise."
2205 (setq command-line-args-left 2205 (setq command-line-args-left
2206 (nthcdr (nth 1 tem) command-line-args-left))) 2206 (nthcdr (nth 1 tem) command-line-args-left)))
2207 2207
2208 ((setq tem (assoc argi command-line-ns-option-alist)) 2208 ((setq tem (assoc argi command-line-ns-option-alist))
2209 ;; Ignore NS-windows options and their args if not using NS. 2209 ;; Ignore NS-windows options and their args if not using NS.
2210 (setq command-line-args-left 2210 (setq command-line-args-left
2211 (nthcdr (nth 1 tem) command-line-args-left))) 2211 (nthcdr (nth 1 tem) command-line-args-left)))
2212 2212
2213 ((member argi '("-find-file" "-file" "-visit")) 2213 ((member argi '("-find-file" "-file" "-visit"))
2214 (setq inhibit-startup-screen t) 2214 (setq inhibit-startup-screen t)