Merge from emacs--rel--22

Patches applied:

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

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

2007-08-02  Richard M. Stallman  <[email protected]>

   * lisp/mail/rmailsum.el (rmail-make-summary-line): Find end of msg number
   to update deleted flag.

   * lisp/cus-edit.el (customize-apropos, customize-apropos-options)
   (customize-apropos-faces, customize-apropos-groups): Improve prompt.

   * lisp/menu-bar.el (menu-bar-help-menu): Add "About GNU" menu item.

   * lisp/startup.el (fancy-splash-head, startup-echo-area-message):
   Change message text.

   * lisp/emulation/tpu-edt.el (next-line-internal): Setting deleted.
   All callers use line-move.

   * lisp/progmodes/compile.el (compilation-find-buffer): Return current
   buffer immediately if suitable.
   (compile, compilation-buffer-name, compilation-start): Doc fixes.

2007-07-31  Daiki Ueno  <[email protected]>

   * lisp/faces.el (face-normalize-spec): New function.
   (frame-set-background-mode): Normalize face-spec before calling
   face-spec-match-p.

2007-07-31  Stefan Monnier  <[email protected]>

   * lisp/server.el (server-window): Add switch-to-buffer-other-frame option.

2007-08-03  Richard M. Stallman  <[email protected]>

   * src/fileio.c (Fvisited_file_modtime): Use make_time.

Revision: [email protected]/emacs--devo--0--patch-844

1 files changed, 3 insertions, 3 deletions

diff --git a/src/xselect.c b/src/xselect.c
index 729c05f190..33468f0d63 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1854,9 +1854,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]);