Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 843-845)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 84-87)

   - Update from CVS
   - Change capitalization of VC backend names for new backends

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-30

1 files changed, 3 insertions, 3 deletions

diff --git a/src/xselect.c b/src/xselect.c
index 7e77df0d6c3..b2d47bd1175 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1873,9 +1873,9 @@ selection_data_to_lisp_data (display, data, size, type, format)
         }
     }
 
-  /* Convert a single 16 or small 32 bit number to a Lisp_Int.
-     If the number is > 16 bits, convert it to a cons of integers,
-     16 bits in each half.
+  /* Convert a single 16-bit number or a small 32-bit number to a Lisp_Int.
+     If the number is 32 bits and won't fit in a Lisp_Int,
+     convert it to a cons of integers, 16 bits in each half.
    */
   else if (format == 32 && size == sizeof (int))
     return long_to_cons (((unsigned int *) data) [0]);