Merge from mainline.

5 files changed, 31 insertions, 27 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 29514f03177..920355b1723 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,6 +9,18 @@
         (mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
         Rename or move local decls.
 
+2011-03-06  Michael Shields  <shields@msrl.com>  (tiny change)
+
+        * window.c (Fnext_window): Doc fix.  (Bug#5567)
+
+2011-03-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
+
+2011-03-02  Ken Brown  <kbrown@cornell.edu>
+
+        * sheap.c (STATIC_HEAP_SIZE): Increase to 13MB.
+
 2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Work around some portability problems with symlinks.
@@ -32,7 +44,7 @@
 
         * msdos.c (readlink) [DJGPP < 2.04]: New stub function.
 
-        * msdos.h: (readlink) [DJGPP < 2.04]: Declare prototype.
+        * msdos.h (readlink) [DJGPP < 2.04]: Declare prototype.
 
         * w32.c (symlink, readlink): New stub functions.
 
@@ -1178,7 +1190,7 @@
         (x_underline_at_descent_line): Remove declaration.
         (syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL.
 
-        * nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks
+        * nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks)
         (Vselection_alist, Vselection_converter_alist): Move to globals.h.
         (syms_of_nsselect): Remove & from DEFVAR_LISP.
 
@@ -2895,7 +2907,7 @@
         (Qglyphless_char_display, Qhexa_code, Qempty_box, Qthin_space)
         (Qzero_width): New variables.
         (THIN_SPACE_WIDTH): New macro.
-        (lookup_glyphless_char_display): New funciton.
+        (lookup_glyphless_char_display): New function.
         (last_glyphless_glyph_frame, last_glyphless_glyph_face_id)
         (last_glyphless_glyph_merged_face_id): New variables.
         (get_next_display_element): Check glyphless characters.
@@ -3181,7 +3193,7 @@
 2010-10-12  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (Qleft): Declare.
-        (ns_right_alternate_modifier): New variable
+        (ns_right_alternate_modifier): New variable.
         (NSRightAlternateKeyMask): New define.
         (EV_MODIFIERS): Parse NSRightAlternateKeyMask if
         ns_right_alternate_modifier isn't Qleft.
@@ -3205,7 +3217,7 @@
         * Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line.
         (PROFILING_LDFLAGS): Remove, not needed anymore.
 
-        * Makefile.in: Use $(...) everywhere instead of ${...}
+        * Makefile.in: Use $(...) everywhere instead of ${...}.
         (CRT_DIR): Move near potential user.
         (START_FILE): Move near CRT_DIR, it might use it.
 
@@ -6142,7 +6154,7 @@
 
         * eval.c: Fix indentation problem.
 
-        * keyboard.c: Include "process.h"
+        * keyboard.c: Include "process.h".
 
         * eval.c: Remove obsolete noinline declaration.
         * fns.c: Likewise.
@@ -8548,7 +8560,7 @@
         Qtool_bar_style.  Initialize current_tool_bar_style to nil.
         defsubr Stool_bar_get_system_style.  Fprovide on
         dynamic-setting.
-        Move misplaced HAVE_GCONF
+        Move misplaced HAVE_GCONF.
 
         * xsettings.h (Ftool_bar_get_system_style): Declare.
 
diff --git a/src/config.in b/src/config.in
index 4e49b4df170..7f33727c0b1 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1203,9 +1203,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # define __restrict__
 #endif
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
 /* Define to any substitute for sys_siglist. */
 #undef sys_siglist
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 8e77c89c3f7..cc2c4cf9807 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -189,7 +189,7 @@ static NSMutableArray *ns_pending_files, *ns_pending_service_names,
   *ns_pending_service_args;
 static BOOL inNsSelect = 0;
 
-/* Convert modifiers in a NeXTSTEP event to emacs style modifiers.  */
+/* Convert modifiers in a NeXTstep event to emacs style modifiers.  */
 #define NS_FUNCTION_KEY_MASK 0x800000
 #define NSLeftControlKeyMask    (0x000001 | NSControlKeyMask)
 #define NSRightControlKeyMask   (0x002000 | NSControlKeyMask)
@@ -2282,9 +2282,8 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
      to the glyph width; replace with CURSOR_WIDTH for bar cursors. */
   if (cursor_type == BAR_CURSOR || cursor_type == HBAR_CURSOR)
     {
-      if (cursor_width < 0)
-        cursor_width = FRAME_CURSOR_WIDTH (f);
-      cursor_width = min (cursor_width, 1);
+      if (cursor_width < 1)
+        cursor_width = max (FRAME_CURSOR_WIDTH (f), 1);
       w->phys_cursor_width = cursor_width;
     }
 
diff --git a/src/sheap.c b/src/sheap.c
index 65fbab538bb..31414fbe5c6 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -25,7 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
 
-#define STATIC_HEAP_SIZE        (12 * 1024 * 1024)
+#define STATIC_HEAP_SIZE        (13 * 1024 * 1024)
 
 int debug_sheap = 0;
 
diff --git a/src/window.c b/src/window.c
index 7965269f0e7..7c55be972b2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1769,8 +1769,10 @@ window_list (void)
 
    ALL_FRAMES   t means search all frames,
                 nil means search just current frame,
-                `visible' means search just visible frames,
-                0 means search visible and iconified frames,
+                `visible' means search just visible frames on the
+                current terminal,
+                0 means search visible and iconified frames on the
+                current terminal,
                 a window means search the frame that window belongs to,
                 a frame means consider windows on that frame, only.  */
 
@@ -1836,8 +1838,8 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf
 
 
 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and
-   Fwindow_list.  See there for the meaning of WINDOW, MINIBUF, and
-   ALL_FRAMES.  */
+   Fwindow_list.  See candidate_window_p for the meaning of WINDOW,
+   MINIBUF, and ALL_FRAMES.  */
 
 static void
 decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object *all_frames)
@@ -1871,12 +1873,6 @@ decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object
     ;
   else if (!EQ (*all_frames, Qt))
     *all_frames = Qnil;
-
-  /* Now *ALL_FRAMES is t meaning search all frames, nil meaning
-     search just current frame, `visible' meaning search just visible
-     frames, 0 meaning search visible and iconified frames, or a
-     window, meaning search the frame that window belongs to, or a
-     frame, meaning consider windows on that frame, only.  */
 }
 
 
@@ -1974,9 +1970,9 @@ ALL-FRAMES nil or omitted means consider all windows on WINDOW's
  windows on all frames that share that minibuffer too.
 ALL-FRAMES t means consider all windows on all existing frames.
 ALL-FRAMES `visible' means consider all windows on all visible
- frames.
+ frames on the current terminal.
 ALL-FRAMES 0 means consider all windows on all visible and
- iconified frames.
+ iconified frames on the current terminal.
 ALL-FRAMES a frame means consider all windows on that frame only.
 Anything else means consider all windows on WINDOW's frame and no
  others.