Merge from trunk.

11 files changed, 69 insertions, 53 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 25271d6f6b8..89c640bd8c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,46 @@
+2013-12-11  Ken Brown  <kbrown@cornell.edu>
+
+        * dispextern.h (erase_phys_cursor):
+        * keyboard.h (make_ctrl_char): Declare prototypes if HAVE_NTGUI.
+
+2013-12-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * nsterm.m (x_free_frame_resources):
+        * term.c (tty_free_frame_resources):
+        * xterm.c (x_free_frame_resources): Do not check for non-NULL
+        face cache because it's implied by free_frame_faces anyway.
+        * w32term.c (x_free_frame_resources): Likewise.  Do not call
+        free_frame_faces twice.
+
+2013-12-11  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+        * editfns.c (Fformat_time_string): Mention %F in the doc.
+
+2013-12-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (resize_frame_windows): Don't return immediately when
+        the root window's size doesn't change - the minibuffer window
+        may still have to be repositioned/resized.
+        * xfns.c (Fx_create_frame): Always change the frame size after
+        initializing the frame's faces.
+        * xterm.c (handle_one_xevent): Don't set pixel sizes here,
+        change_frame_size should already have done it.
+        (x_new_font): Assign new tool- and menu-bar heights.
+        (x_set_window_size_1): Account for tool- and menu-bar heights
+        (Bug#16013). Don't set pixel sizes since change_frame_size
+        should already have done it.
+
+2013-12-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove the option of using libcrypto.
+        * Makefile.in (LIB_CRYPTO): Remove.
+        (LIBES): Don't use it.
+
+2013-12-11  Juri Linkov  <juri@jurta.org>
+
+        * term.c (term_get_fkeys_1): Remove non-standard IBM terminfo
+        as obsolete to avoid conflicts with <S-up>.  (Bug#13471)
+
 2013-12-10  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * xdisp.c (display_tool_bar_line): Don't extend on a previously
diff --git a/src/Makefile.in b/src/Makefile.in
index cef1ba5ed2e..7d91928acfe 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -139,7 +139,6 @@ M17N_FLT_LIBS = @M17N_FLT_LIBS@
 
 LIB_ACL=@LIB_ACL@
 LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@
-LIB_CRYPTO=@LIB_CRYPTO@
 LIB_EACCESS=@LIB_EACCESS@
 LIB_FDATASYNC=@LIB_FDATASYNC@
 LIB_TIMER_TIME=@LIB_TIMER_TIME@
@@ -404,7 +403,6 @@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj)
 LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
    $(LIBX_OTHER) $(LIBSOUND) \
    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \
-   $(LIB_CRYPTO) \
    $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
    $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) \
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
diff --git a/src/dispextern.h b/src/dispextern.h
index 7de4edf2196..5976d068a78 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3251,7 +3251,7 @@ extern void draw_phys_cursor_glyph (struct window *,
                                     enum draw_glyphs_face);
 extern void get_phys_cursor_geometry (struct window *, struct glyph_row *,
                                       struct glyph *, int *, int *, int *);
-#ifdef WINDOWSNT
+#if HAVE_NTGUI
 extern void erase_phys_cursor (struct window *);
 #endif
 extern void display_and_set_cursor (struct window *, bool, int, int, int, int);
diff --git a/src/editfns.c b/src/editfns.c
index 8e47d1f82e4..f67b95a8e81 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1723,6 +1723,7 @@ by text that describes the specified date and time in TIME:
 %c is the locale's date and time format.
 %x is the locale's "preferred" date format.
 %D is like "%m/%d/%y".
+%F is the ISO 8601 date format (like "%Y-%m-%d").
 
 %R is like "%H:%M", %T is like "%H:%M:%S", %r is like "%I:%M:%S %p".
 %X is the locale's "preferred" time format.
@@ -1741,7 +1742,7 @@ The modifiers are `E' and `O'.  For certain characters X,
 %EX is a locale's alternative version of %X;
 %OX is like %X, but uses the locale's number symbols.
 
-For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".
+For example, to produce full ISO 8601 format, use "%FT%T%z".
 
 usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL)  */)
   (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal)
diff --git a/src/keyboard.h b/src/keyboard.h
index a1aa59fe988..33a2d535cd6 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -518,7 +518,7 @@ extern bool input_polling_used (void);
 extern void clear_input_pending (void);
 extern bool requeued_events_pending_p (void);
 extern void bind_polling_period (int);
-#ifdef WINDOWSNT
+#if HAVE_NTGUI
 extern int make_ctrl_char (int) ATTRIBUTE_CONST;
 #endif
 extern void stuff_buffered_input (Lisp_Object);
diff --git a/src/nsterm.m b/src/nsterm.m
index 9c87923f32e..733c05ae53a 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1155,9 +1155,7 @@ x_free_frame_resources (struct frame *f)
   block_input ();
 
   free_frame_menubar (f);
-
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
+  free_frame_faces (f);
 
   if (f == dpyinfo->x_focus_frame)
     dpyinfo->x_focus_frame = 0;
diff --git a/src/term.c b/src/term.c
index 4d900020ce6..7b6cb41e23d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1422,18 +1422,6 @@ term_get_fkeys_1 (void)
       CONDITIONAL_REASSIGN ("kD", "kI", "insert");
       /* if there's no key_end keycap, map key_ll to 'end' keysym */
       CONDITIONAL_REASSIGN ("@7", "kH", "end");
-
-      /* IBM has their own non-standard dialect of terminfo.
-         If the standard name isn't found, try the IBM name.  */
-      CONDITIONAL_REASSIGN ("kB", "KO", "backtab");
-      CONDITIONAL_REASSIGN ("@4", "kJ", "execute"); /* actually "action" */
-      CONDITIONAL_REASSIGN ("@4", "kc", "execute"); /* actually "command" */
-      CONDITIONAL_REASSIGN ("%7", "ki", "menu");
-      CONDITIONAL_REASSIGN ("@7", "kw", "end");
-      CONDITIONAL_REASSIGN ("F1", "k<", "f11");
-      CONDITIONAL_REASSIGN ("F2", "k>", "f12");
-      CONDITIONAL_REASSIGN ("%1", "kq", "help");
-      CONDITIONAL_REASSIGN ("*6", "kU", "select");
 #undef CONDITIONAL_REASSIGN
   }
 
@@ -3845,10 +3833,7 @@ static void
 tty_free_frame_resources (struct frame *f)
 {
   eassert (FRAME_TERMCAP_P (f));
-
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
-
+  free_frame_faces (f);
   xfree (f->output_data.tty);
 }
 
@@ -3860,9 +3845,7 @@ static void
 tty_free_frame_resources (struct frame *f)
 {
   eassert (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f));
-
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
+  free_frame_faces (f);
 }
 #endif  /* MSDOS */
 
diff --git a/src/w32term.c b/src/w32term.c
index 64febea6a1a..3d6b653157b 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6101,17 +6101,13 @@ x_free_frame_resources (struct frame *f)
   /* We must free faces before destroying windows because some
      font-driver (e.g. xft) access a window while finishing a
      face.  */
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
+  free_frame_faces (f);
 
   if (FRAME_W32_WINDOW (f))
     my_destroy_window (f, FRAME_W32_WINDOW (f));
 
   free_frame_menubar (f);
 
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);
-
   xfree (f->output_data.w32);
   f->output_data.w32 = NULL;
 
diff --git a/src/window.c b/src/window.c
index 426edc6099c..9bf6ad4b8f3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4057,7 +4057,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
   r->pixel_top = FRAME_TOP_MARGIN_HEIGHT (f);
 
   if (new_pixel_size == old_pixel_size)
-    return;
+    ;
   else if (WINDOW_LEAF_P (r))
     /* For a leaf root window just set the size.  */
     if (horflag)
diff --git a/src/xfns.c b/src/xfns.c
index 3c8df12f8c5..7200c5fb2e7 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3069,7 +3069,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
      happen.  */
   init_frame_faces (f);
 
-#ifdef USE_GTK
   /* PXW: This is a duplicate from below.  We have to do it here since
      otherwise x_set_tool_bar_lines will work with the character sizes
      installed by init_frame_faces while the frame's pixel size is still
@@ -3078,12 +3077,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
      non-pixelwise code apparently worked around this because it had one
      frame line vs one toolbar line which left us with a zero root
      window height which was obviously wrong as well ...  */
-  width = FRAME_TEXT_WIDTH (f);
-  height = FRAME_TEXT_HEIGHT (f);
-  FRAME_TEXT_HEIGHT (f) = 0;
-  SET_FRAME_WIDTH (f, 0);
-  change_frame_size (f, width, height, 1, 0, 0, 1);
-#endif /* USE_GTK */
+  change_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
+                     FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 1, 0, 0, 1);
 
   /* Set the menu-bar-lines and tool-bar-lines parameters.  We don't
      look up the X resources controlling the menu-bar and tool-bar
diff --git a/src/xterm.c b/src/xterm.c
index 90c7c36c44f..2c5c01baa84 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6622,8 +6622,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
               cancel_mouse_face (f);
             }
 
-          FRAME_PIXEL_WIDTH (f) = event->xconfigure.width;
-          FRAME_PIXEL_HEIGHT (f) = event->xconfigure.height;
+/**           FRAME_PIXEL_WIDTH (f) = event->xconfigure.width; **/
+/**           FRAME_PIXEL_HEIGHT (f) = event->xconfigure.height; **/
 #endif /* not USE_GTK */
 #endif
 
@@ -7689,6 +7689,9 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
   FRAME_COLUMN_WIDTH (f) = font->average_width;
   FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (font);
 
+  FRAME_TOOL_BAR_HEIGHT (f) = FRAME_TOOL_BAR_LINES (f) * FRAME_LINE_HEIGHT (f);
+  FRAME_MENU_BAR_HEIGHT (f) = FRAME_MENU_BAR_LINES (f) * FRAME_LINE_HEIGHT (f);
+
   compute_fringe_widths (f, 1);
 
   /* Compute the scroll bar width in character columns.  */
@@ -8541,13 +8544,15 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int width, int height,
 
   compute_fringe_widths (f, 0);
 
-  pixelwidth =
-    (pixelwise ? width : FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width))
-    + FRAME_TOOLBAR_WIDTH (f);
-  pixelheight =
-    (pixelwise ? height : FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height))
-    + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
-
+  pixelwidth = ((pixelwise
+                 ? FRAME_TEXT_TO_PIXEL_WIDTH (f, width)
+                 : FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width))
+                + FRAME_TOOLBAR_WIDTH (f));
+  pixelheight = ((pixelwise
+                  ? FRAME_TEXT_TO_PIXEL_HEIGHT (f, height)
+                  : FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height))
+                 + FRAME_MENUBAR_HEIGHT (f)
+                 + FRAME_TOOLBAR_HEIGHT (f));
   if (change_gravity) f->win_gravity = NorthWestGravity;
   x_wm_set_size_hint (f, (long) 0, 0);
   XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
@@ -8582,8 +8587,6 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int width, int height,
   else
     {
       change_frame_size (f, width, height, 0, 1, 0, 1);
-      FRAME_PIXEL_WIDTH (f) = pixelwidth;
-      FRAME_PIXEL_HEIGHT (f) = pixelheight;
       x_sync (f);
     }
 }
@@ -9126,8 +9129,7 @@ x_free_frame_resources (struct frame *f)
       /* We must free faces before destroying windows because some
          font-driver (e.g. xft) access a window while finishing a
          face.  */
-      if (FRAME_FACE_CACHE (f))
-        free_frame_faces (f);
+      free_frame_faces (f);
 
       if (f->output_data.x->icon_desc)
         XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc);