[Emacs-diffs] /srv/bzr/emacs/trunk r99344: Command line arg processing fix (Bug#5392)

[Chong Yidong]

------------------------------------------------------------
revno: 99344
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-16 14:28:59 -0500
message:
  Command line arg processing fix (Bug#5392)
  
  * src/emacs.c (standard_args): Adjust arg priorities to reflect how
  they are processed in startup.el.
  
  * lisp/startup.el (command-line): Remove unused --icon-type arg.
  Handle --display arg, passing it to command-line-1 (Bug#5392).
modified:
  lisp/ChangeLog
  lisp/startup.el
  src/ChangeLog
  src/emacs.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-16 02:51:50 +0000
+++ b/lisp/ChangeLog    2010-01-16 19:28:59 +0000
@@ -1,3 +1,8 @@
+2010-01-16  Chong Yidong  <address@hidden>
+
+       * startup.el (command-line): Remove unused --icon-type arg.
+       Handle --display arg, passing it to command-line-1 (Bug#5392).
+
 2010-01-16  Mario Lang  <address@hidden>
 
        * cedet/ede/cpp-root.el (ede-cpp-root-project):

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2010-01-13 08:35:10 +0000
+++ b/lisp/startup.el   2010-01-16 19:28:59 +0000
@@ -758,7 +758,8 @@
       (pop args)))
 
   (let ((done nil)
-       (args (cdr command-line-args)))
+       (args (cdr command-line-args))
+       display-arg)
 
     ;; Figure out which user's init file to load,
     ;; either from the environment or from the options.
@@ -794,6 +795,11 @@
                (setq argval nil
                       argi orig-argi)))))
        (cond
+        ;; The --display arg is handled partly in C, partly in Lisp.
+        ;; When it shows up here, we just put it back to be handled
+        ;; by `command-line-1'.
+        ((member argi '("-d" "-display"))
+         (setq display-arg (list argi (pop args))))
         ((member argi '("-Q" "-quick"))
          (setq init-file-user nil
                site-run-file nil
@@ -813,8 +819,6 @@
          (setq init-file-debug t))
         ((equal argi "-iconic")
          (push '(visibility . icon) initial-frame-alist))
-        ((member argi '("-icon-type" "-i" "-itype"))
-         (push '(icon-type . t) default-frame-alist))
         ((member argi '("-nbc" "-no-blinking-cursor"))
          (setq no-blinking-cursor t))
         ;; Push the popped arg back on the list of arguments.
@@ -825,6 +829,9 @@
        (and argval
             (error "Option `%s' doesn't allow an argument" argi))))
 
+    ;; Re-attach the --display arg.
+    (and display-arg (setq args (append display-arg args)))
+
     ;; Re-attach the program name to the front of the arg list.
     (and command-line-args
          (setcdr command-line-args args)))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-16 09:40:57 +0000
+++ b/src/ChangeLog     2010-01-16 19:28:59 +0000
@@ -1,3 +1,8 @@
+2010-01-16  Chong Yidong  <address@hidden>
+
+       * emacs.c (standard_args): Adjust arg priorities to reflect how
+       they are processed in startup.el.
+
 2010-01-16  Andreas Schwab  <address@hidden>
 
        * Makefile.in (lisp, shortlisp): Update.

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2010-01-13 15:38:28 +0000
+++ b/src/emacs.c       2010-01-16 19:28:59 +0000
@@ -1869,7 +1869,7 @@
   /* -d must come last before the options handled in startup.el.  */
   { "-d", "--display", 60, 1 },
   { "-display", 0, 60, 1 },
-  /* Now for the options handled in startup.el.  */
+  /* Now for the options handled in `command-line' (startup.el).  */
   { "-Q", "--quick", 55, 0 },
   { "-quick", 0, 55, 0 },
   { "-q", "--no-init-file", 50, 0 },
@@ -1878,10 +1878,12 @@
   { "-u", "--user", 30, 1 },
   { "-user", 0, 30, 1 },
   { "-debug-init", "--debug-init", 20, 0 },
-  { "-nbi", "--no-bitmap-icon", 15, 0 },
   { "-iconic", "--iconic", 15, 0 },
   { "-D", "--basic-display", 12, 0},
   { "-basic-display", 0, 12, 0},
+  { "-nbc", "--no-blinking-cursor", 12, 0 },
+  /* Now for the options handled in `command-line-1' (startup.el).  */
+  { "-nbi", "--no-bitmap-icon", 10, 0 },
   { "-bg", "--background-color", 10, 1 },
   { "-background", 0, 10, 1 },
   { "-fg", "--foreground-color", 10, 1 },
@@ -1891,7 +1893,6 @@
   { "-ib", "--internal-border", 10, 1 },
   { "-ms", "--mouse-color", 10, 1 },
   { "-cr", "--cursor-color", 10, 1 },
-  { "-nbc", "--no-blinking-cursor", 10, 0 },
   { "-fn", "--font", 10, 1 },
   { "-font", 0, 10, 1 },
   { "-fs", "--fullscreen", 10, 0 },