comparison src/xselect.c @ 82251:b8c796068320

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 Stallman <rms@gnu.org> * 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 <ueno@unixuser.org> * 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 <monnier@iro.umontreal.ca> * lisp/server.el (server-window): Add switch-to-buffer-other-frame option. 2007-08-03 Richard Stallman <rms@gnu.org> * src/fileio.c (Fvisited_file_modtime): Use make_time. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-844
author Miles Bader <miles@gnu.org>
date Fri, 03 Aug 2007 05:49:59 +0000
parents b98604865ea0 627812b69d17
children 984b1dfd7601 cd5e99697764
comparison
equal deleted inserted replaced
82250:e9f1bfddeebc 82251:b8c796068320
1852 x_atom_to_symbol (display, (Atom) idata[i])); 1852 x_atom_to_symbol (display, (Atom) idata[i]));
1853 return v; 1853 return v;
1854 } 1854 }
1855 } 1855 }
1856 1856
1857 /* Convert a single 16 or small 32 bit number to a Lisp_Int. 1857 /* Convert a single 16-bit number or a small 32-bit number to a Lisp_Int.
1858 If the number is > 16 bits, convert it to a cons of integers, 1858 If the number is 32 bits and won't fit in a Lisp_Int,
1859 16 bits in each half. 1859 convert it to a cons of integers, 16 bits in each half.
1860 */ 1860 */
1861 else if (format == 32 && size == sizeof (int)) 1861 else if (format == 32 && size == sizeof (int))
1862 return long_to_cons (((unsigned int *) data) [0]); 1862 return long_to_cons (((unsigned int *) data) [0]);
1863 else if (format == 16 && size == sizeof (short)) 1863 else if (format == 16 && size == sizeof (short))
1864 return make_number ((int) (((unsigned short *) data) [0])); 1864 return make_number ((int) (((unsigned short *) data) [0]));