upstream

14 files changed, 108 insertions, 25 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1e86e07998c..2da562bdcfb 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * windows.texi (Window Sizes): Mention in the doc string that the
+        return values of `window-body-height' and `window-body-width' are
+        in frame's canonical units.  (Bug#9949)
+
 2011-10-30  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Windows and Frames): Remove "iso-" infix from
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 37679aa4a0b..bd20f5d8f44 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -563,8 +563,18 @@ window's body width.
 
 @cindex body size of a window
 @cindex window body size
-The following functions retrieve height and width of the body of a live
-window:
+@cindex canonical units of window/frame size
+The following functions retrieve height and width of the body of a
+live window.  Note that the values these functions return are measured
+in @dfn{canonical units}, i.e.@: for the default frame's face.  If the
+window shows some characters with non-default face, e.g., if the font
+of some characters is larger or smaller than the default font, the
+values returned by these functions will not match the actual number of
+lines or characters per line shown in the window.  To get the actual
+number of columns and lines, move to the last character in the line
+(e.g., with @code{end-of-visual-line}) or to the last line of the
+window (e.g., with @code{window-end}), and use @code{posn-at-point} to
+find the line or column there.
 
 @defun window-body-size &optional window horizontal
 This function returns the number of lines of @var{window}'s text area.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a94987284de..eb276721dbc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2011-11-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.el (window-body-height, window-body-width): Mention in
+        the doc string that the return values are in frame's canonical
+        units.  (Bug#9949)
+
+2011-11-03  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-langs.el (c-nonlabel-token-2-key): New variable for
+        change in cc-engine.el.
+
 2011-11-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.el (switch-to-buffer): Use `force-same-window' interactively.
@@ -136,7 +147,6 @@
 
         * progmodes/cc-langs.el (c-defun-tactic): Move this variable to
         cc-vars.el.
-        (c-nonlabel-token-2-key): New variable for change in cc-engine.el.
 
         * progmodes/cc-engine.el (c-beginning-of-statement-1):
         Prevent "class foo : bar" being spuriously recognized as a label.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3fb44bb5b10..c36d4729518 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-articles-to-read): Change wording in prompt to be
+        slightly clearer.
+
+2011-11-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * message.el (message-send-and-exit): Document `arg'.
+
 2011-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * nnimap.el (nnimap-open-connection-1): Use tcp-keealive if possible.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 66b661884e9..b84c493cc58 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -5859,15 +5859,15 @@ If SELECT-ARTICLES, only select those articles from GROUP."
                           (read-string
                            (if only-read-p
                                (format
-                              "How many articles from %s (available %d, default %d): "
-                              (gnus-group-decoded-name
-                               (gnus-group-real-name gnus-newsgroup-name))
-                              number default)
-                             (format
-                                "How many articles from %s (%d available): "
+                                "How many articles from %s (available %d, default %d): "
                                 (gnus-group-decoded-name
                                  (gnus-group-real-name gnus-newsgroup-name))
-                                default))
+                                number default)
+                             (format
+                              "How many articles from %s (%d default): "
+                              (gnus-group-decoded-name
+                               (gnus-group-real-name gnus-newsgroup-name))
+                              default))
                            nil
                            nil
                            (number-to-string default))))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 723f8fb72b5..1d0830afd28 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4022,7 +4022,9 @@ The text will also be indented the normal way."
 ;;;
 
 (defun message-send-and-exit (&optional arg)
-  "Send message like `message-send', then, if no errors, exit from mail buffer."
+  "Send message like `message-send', then, if no errors, exit from mail buffer.
+The usage of ARG is defined by the instance that called Message.
+It should typically alter the sending method in some way or other."
   (interactive "P")
   (let ((buf (current-buffer))
         (actions message-exit-actions))
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 09f8b318378..e1fb69c30c8 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -3012,6 +3012,14 @@ i.e. before \":\".  Only used if `c-recognize-colon-labels' is set."
   c++ (concat "\\s\(\\|" (c-lang-const c-nonlabel-token-key)))
 (c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key))
 
+(c-lang-defconst c-nonlabel-token-2-key
+  "Regexp matching things that can't occur two symbols before a colon in
+a label construct.  This catches C++'s inheritance construct \"class foo
+: bar\".  Only used if `c-recognize-colon-labels' is set."
+  t "\\<\\>"                            ; matches nothing
+  c++ (c-make-keywords-re t '("class")))
+(c-lang-defvar c-nonlabel-token-2-key (c-lang-const c-nonlabel-token-2-key))
+
 (c-lang-defconst c-opt-extra-label-key
   "Optional regexp matching labels.
 Normally, labels are detected according to `c-nonlabel-token-key',
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 1b6890e5252..a2a1b451258 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-cookie.el (url-cookie-expired-p): Protect against
+        zero-length cookie expiry dates.
+
 2011-10-19  Chong Yidong  <cyd@gnu.org>
 
         * url-handlers.el (url-handler-mode): Doc fix.
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 78afa1633b6..f8417791ce5 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -156,7 +156,8 @@ telling Microsoft that."
 (defun url-cookie-expired-p (cookie)
   "Return non-nil if COOKIE is expired."
   (let ((exp (url-cookie-expires cookie)))
-    (and exp (> (float-time) (float-time (date-to-time exp))))))
+    (and (> (length exp) 0)
+         (> (float-time) (float-time (date-to-time exp))))))
 
 (defun url-cookie-retrieve (host &optional localpart secure)
   "Retrieve all cookies for a specified HOST and LOCALPART."
diff --git a/lisp/window.el b/lisp/window.el
index 9b12c204d48..d6ab5e0e6cc 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -972,7 +972,14 @@ The return value does not include WINDOW's mode line and header
 line, if any.  If a line at the bottom of the window is only
 partially visible, that line is included in the return value.  If
 you do not want to include a partially visible bottom line in the
-return value, use `window-text-height' instead."
+return value, use `window-text-height' instead.
+
+Note that the return value is measured in canonical units, i.e. for
+the default frame's face.  If the window shows some characters with
+non-default face, e.g., if the font of some characters is larger or
+smaller than the default font, the value returned by this function
+will not match the actual number of lines shown in the window.  To
+get the actual number of lines, use `posn-at-point'."
   (window-body-size window))
 
 (defsubst window-body-width (&optional window)
@@ -982,7 +989,14 @@ WINDOW must be a live window and defaults to the selected one.
 The return value does not include any vertical dividers or scroll
 bars owned by WINDOW.  On a window-system the return value does
 not include the number of columns used for WINDOW's fringes or
-display margins either."
+display margins either.
+
+Note that the return value is measured in canonical units, i.e. for
+the default frame's face.  If the window shows some characters with
+non-default face, e.g., if the font of some characters is larger or
+smaller than the default font, the value returned by this function
+will not match the actual number of characters per line shown in the
+window.  To get the actual number of columns, use `posn-at-point'."
   (window-body-size window t))
 
 ;; Eventually we should make `window-height' obsolete.
diff --git a/src/ChangeLog b/src/ChangeLog
index 67f8507a26b..ccfcb48daf0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,15 @@
+2011-11-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.c (Fwindow_body_size): Mention in the doc string that the
+        return value is in frame's canonical units.  (Bug#9949)
+
 2011-11-03  Eli Zaretskii  <eliz@gnu.org>
 
+        * xdisp.c (note_mouse_highlight): Initialize `area'.  (Bug#9947)
+
         * w32fns.c (unwind_create_frame): If needed, free the glyph
         matrices of the partially constructed frame.  (Bug#9943)
+        * xfns.c (unwind_create_frame): Likewise.
 
 2011-11-01  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/window.c b/src/window.c
index 056da1512da..496a4e6c6ea 100644
--- a/src/window.c
+++ b/src/window.c
@@ -655,16 +655,25 @@ window_body_cols (struct window *w)
 }
 
 DEFUN ("window-body-size", Fwindow_body_size, Swindow_body_size, 0, 2, 0,
-       doc: /* Return the number of lines of WINDOW's body.
-WINDOW must be a live window and defaults to the selected one.  The
-return value does not include WINDOW's mode line and header line, if
-any.
-
-Optional argument HORIZONTAL non-nil means return the number of columns
-of WINDOW's body.  In this case, the return value does not include any
-vertical dividers or scroll bars owned by WINDOW.  On a window-system
-the return value does not include the number of columns used for
-WINDOW's fringes or display margins either.  */)
+       doc: /* Return the number of lines or columns of WINDOW's body.
+WINDOW must be a live window and defaults to the selected one.
+
+If the optional argument HORIZONTAL is omitted or nil, the function
+returns the number of WINDOW's lines, excluding the mode line and
+header line, if any.
+
+If HORIZONTAL is non-nil, the function returns the number of columns
+excluding any vertical dividers or scroll bars owned by WINDOW.  On a
+window-system the return value also excludes the number of columns
+used for WINDOW's fringes or display margins.
+
+Note that the return value is measured in canonical units, i.e. for
+the default frame's face.  If the window shows some characters with
+non-default face, e.g., if the font of some characters is larger or
+smaller than the default font, the value returned by this function
+will not match the actual number of lines or characters per line
+shown in the window.  To get the actual number of columns and lines,
+use `posn-at-point'.  */)
   (Lisp_Object window, Lisp_Object horizontal)
 {
   struct window *w = decode_any_window (window);
diff --git a/src/xdisp.c b/src/xdisp.c
index b7fc1141e28..6414ab00fd8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -27130,7 +27130,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
       && XFASTINT (w->last_modified) == BUF_MODIFF (b)
       && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b))
     {
-      int hpos, vpos, dx, dy, area;
+      int hpos, vpos, dx, dy, area = LAST_AREA;
       EMACS_INT pos;
       struct glyph *glyph;
       Lisp_Object object;
diff --git a/src/xfns.c b/src/xfns.c
index 913cde75d91..ac030582ffe 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2936,6 +2936,7 @@ unwind_create_frame (Lisp_Object frame)
 #endif
 
       x_free_frame_resources (f);
+      free_glyphs (f);
 
 #if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */