Merge from mainline.

5 files changed, 57 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95410b9393a..70874a9c2fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * startup.el (command-line-1): Use orig-argi to check for ignored X and
+        NS options.
+
 2010-01-08  Kenichi Handa  <handa@m17n.org>
 
         * international/fontset.el (build-default-fontset-data): Exclude
diff --git a/lisp/startup.el b/lisp/startup.el
index da0264dba20..a8f2eae0613 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2184,12 +2184,12 @@ A fancy display is used on graphic displays, normal otherwise."
                    (setq cl1-line (string-to-number (match-string 1 argi))
                          cl1-column (string-to-number (match-string 2 argi))))
 
-                  ((setq cl1-tem (assoc argi command-line-x-option-alist))
+                  ((setq cl1-tem (assoc orig-argi command-line-x-option-alist))
                    ;; Ignore X-windows options and their args if not using X.
                    (setq command-line-args-left
                          (nthcdr (nth 1 cl1-tem) command-line-args-left)))
 
-                  ((setq cl1-tem (assoc argi command-line-ns-option-alist))
+                  ((setq cl1-tem (assoc orig-argi command-line-ns-option-alist))
                    ;; Ignore NS-windows options and their args if not using NS.
                    (setq command-line-args-left
                          (nthcdr (nth 1 cl1-tem) command-line-args-left)))
diff --git a/src/ChangeLog b/src/ChangeLog
index 309c663d1ef..bd9c6cfbfdf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * editfns.c (Ffloat_time): Doc fix.
+
+2010-01-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (Fx_create_frame): Don't create frame larger than display
+        by default bug#3643.
+
 2010-01-09  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * frame.h (FRAME_TOP_MARGIN_HEIGHT): New macro.
diff --git a/src/editfns.c b/src/editfns.c
index 927bf50194a..cb302f7b1e7 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1574,7 +1574,8 @@ instead of the current time.  The argument should have the form
 have the form (HIGH . LOW), but this is considered obsolete.
 
 WARNING: Since the result is floating point, it may not be exact.
-Do not use this function if precise time stamps are required.  */)
+If precise time stamps are required, use either `current-time',
+or (if you need time as a string) `format-time-string'.  */)
      (specified_time)
      Lisp_Object specified_time;
 {
diff --git a/src/xfns.c b/src/xfns.c
index 572cf38e0c7..db42e005d75 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3396,6 +3396,45 @@ This function is an internal primitive--use `make-frame' instead.  */)
   /* Compute the size of the X window.  */
   window_prompting = x_figure_window_size (f, parms, 1);
 
+  /* Don't make height higher than display height unless the user asked
+     for it.  */
+  height = FRAME_LINES (f);
+  tem = x_get_arg (dpyinfo, parms, Qheight, 0, 0, RES_TYPE_NUMBER);
+  if (EQ (tem, Qunbound))
+    {
+      int ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, FRAME_LINES (f));
+      int dph = DisplayHeight (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
+      if (ph > dph)
+        {
+          height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, dph) -
+            FRAME_TOOL_BAR_LINES (f) - FRAME_MENU_BAR_LINES (f);
+          if (FRAME_EXTERNAL_TOOL_BAR (f))
+            height -= 2; /* We can't know how big it will be.  */
+          if (FRAME_EXTERNAL_MENU_BAR (f))
+            height -= 2; /* We can't know how big it will be.  */
+        }
+    }
+
+  /* Don't make width wider than display width unless the user asked
+     for it.  */
+  width = FRAME_COLS (f);
+  tem = x_get_arg (dpyinfo, parms, Qwidth, 0, 0, RES_TYPE_NUMBER);
+  if (EQ (tem, Qunbound))
+    {
+      int pw = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, FRAME_COLS (f));
+      int dpw = DisplayWidth (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
+      if (pw > dpw)
+        width = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, dpw);
+    }
+
+  if (height != FRAME_LINES (f) || width != FRAME_COLS (f))
+    {
+      check_frame_size (f, &height, &width);
+      FRAME_LINES (f) = height;
+      SET_FRAME_COLS (f, width);
+    }
+  
+
   tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
   f->no_split = minibuffer_only || EQ (tem, Qt);