Mercurial > emacs
changeset 109427:9d1a0d3d72be
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 07 Jul 2010 22:09:05 +0000 |
| parents | 812261a6ffd2 (current diff) a7b09b567d58 (diff) |
| children | 5ba21f4a3d62 |
| files | |
| diffstat | 35 files changed, 656 insertions(+), 537 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jul 06 22:53:26 2010 +0000 +++ b/ChangeLog Wed Jul 07 22:09:05 2010 +0000 @@ -1,3 +1,7 @@ +2010-07-07 Dan Nicolaescu <dann@ics.uci.edu> + + * configure.in (getenv): Remove K&R declaration. + 2010-07-02 Jan Djärv <jan.h.d@swipnet.se> * configure.in: Remove define __P.
--- a/configure.in Tue Jul 06 22:53:26 2010 +0000 +++ b/configure.in Wed Jul 07 22:09:05 2010 +0000 @@ -3540,11 +3540,6 @@ #define my_strftime nstrftime /* for strftime.c */ -/* Some of the files of Emacs which are intended for use with other - programs assume that if you have a config.h file, you must declare - the type of getenv. */ -extern char *getenv (); - /* These default definitions are good for almost all machines. The exceptions override them in m/MACHINE.h. */
--- a/lisp/ChangeLog Tue Jul 06 22:53:26 2010 +0000 +++ b/lisp/ChangeLog Wed Jul 07 22:09:05 2010 +0000 @@ -1,3 +1,29 @@ +2010-07-07 Agustín Martín <agustin.martin@hispalinux.es> + + * ispell.el (ispell-alternate-dictionary): Use file-readable-p. + Return nil if no word-list is found at default locations. + (ispell-complete-word-dict): Default to nil. + (ispell-command-loop): Use 'word-list' when using lookup-words. + (lookup-words): Use ispell-complete-word-dict or + ispell-alternate-dictionary. Check for word-list availability + and handle errors if needed with better messages (Bug#6539). + (ispell-complete-word): Use ispell-complete-word-dict or + ispell-alternate-dictionary. + +2010-07-07 Glenn Morris <rgm@gnu.org> + + * play/zone.el (top-level): Do not require timer, tabify, or cl. + (zone-shift-left): Ignore intangibility, and any errors from + forward-char. + (zone-shift-right): Remove no-op end-of-line. Ignore intangibility. + (zone-pgm-putz-with-case): Use upcase-region rather than inserting, + deleting, and copying text properties. + (zone-line-specs, zone-pgm-stress): Check forward-line exit status. + (zone-pgm-rotate): Handle odd buffers like that of gomoku, where getting + to point-max is hard. + (zone-fret, zone-fill-out-screen): Replace cl's do with dotimes. + (zone-fill-out-screen): Ignore intangibility. + 2010-07-05 Chong Yidong <cyd@stupidchicken.com> * menu-bar.el (menu-bar-mode):
--- a/lisp/play/zone.el Tue Jul 06 22:53:26 2010 +0000 +++ b/lisp/play/zone.el Wed Jul 07 22:09:05 2010 +0000 @@ -1,7 +1,7 @@ ;;; zone.el --- idle display hacks -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Victor Zandy <zandy@cs.wisc.edu> ;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org> @@ -40,10 +40,6 @@ ;;; Code: -(require 'timer) -(require 'tabify) -(eval-when-compile (require 'cl)) - (defvar zone-timer nil "The timer we use to decide when to zone out, or nil if none.") @@ -210,19 +206,20 @@ (insert s))) (defun zone-shift-left () - (let (s) + (let ((inhibit-point-motion-hooks t) + s) (while (not (eobp)) (unless (eolp) (setq s (buffer-substring (point) (1+ (point)))) (delete-char 1) (end-of-line) (insert s)) - (forward-char 1)))) + (ignore-errors (forward-char 1))))) (defun zone-shift-right () (goto-char (point-max)) - (end-of-line) - (let (s) + (let ((inhibit-point-motion-hooks t) + s) (while (not (bobp)) (unless (bolp) (setq s (buffer-substring (1- (point)) (point))) @@ -348,15 +345,8 @@ (let ((np (+ 2 (random 5))) (pm (point-max))) (while (< np pm) - (goto-char np) - (let ((prec (preceding-char)) - (props (text-properties-at (1- (point))))) - (insert (if (zerop (random 2)) - (upcase prec) - (downcase prec))) - (set-text-properties (1- (point)) (point) props)) - (backward-char 2) - (delete-char 1) + (funcall (if (zerop (random 2)) 'upcase-region + 'downcase-region) (1- np) np) (setq np (+ np (1+ (random 5)))))) (goto-char (point-min)) (sit-for 0 2))) @@ -365,13 +355,14 @@ ;;;; rotating (defun zone-line-specs () - (let (ret) + (let ((ok t) + ret) (save-excursion (goto-char (window-start)) - (while (< (point) (window-end)) + (while (and ok (< (point) (window-end))) (when (looking-at "[\t ]*\\([^\n]+\\)") (setq ret (cons (cons (match-beginning 1) (match-end 1)) ret))) - (forward-line 1))) + (setq ok (zerop (forward-line 1))))) ret)) (defun zone-pgm-rotate (&optional random-style) @@ -404,6 +395,7 @@ (setq cut 1 paste 2) (setq cut 2 paste 1)) (goto-char (aref ent cut)) + (setq aamt (min aamt (- (point-max) (point)))) (setq txt (buffer-substring (point) (+ (point) aamt))) (delete-char aamt) (goto-char (aref ent paste)) @@ -447,19 +439,19 @@ (hmm (cond ((string-match "[a-z]" c-string) (upcase c-string)) ((string-match "[A-Z]" c-string) (downcase c-string)) - (t (propertize " " 'display `(space :width ,cw-ceil)))))) - (do ((i 0 (1+ i)) - (wait 0.5 (* wait 0.8))) - ((= i 20)) + (t (propertize " " 'display `(space :width ,cw-ceil))))) + (wait 0.5)) + (dotimes (i 20) (goto-char pos) (delete-char 1) (insert (if (= 0 (% i 2)) hmm c-string)) - (zone-park/sit-for wbeg wait)) + (zone-park/sit-for wbeg (setq wait (* wait 0.8)))) (delete-char -1) (insert c-string))) (defun zone-fill-out-screen (width height) (let ((start (window-start)) - (line (make-string width 32))) + (line (make-string width 32)) + (inhibit-point-motion-hooks t)) (goto-char start) ;; fill out rectangular ws block (while (progn (end-of-line) @@ -473,8 +465,7 @@ (let ((nl (- height (count-lines (point-min) (point))))) (when (> nl 0) (setq line (concat line "\n")) - (do ((i 0 (1+ i))) - ((= i nl)) + (dotimes (i nl) (insert line)))) (goto-char start) (recenter 0) @@ -587,11 +578,12 @@ (defun zone-pgm-stress () (goto-char (point-min)) - (let (lines) - (while (< (point) (point-max)) + (let ((ok t) + lines) + (while (and ok (< (point) (point-max))) (let ((p (point))) - (forward-line 1) - (setq lines (cons (buffer-substring p (point)) lines)))) + (setq ok (zerop (forward-line 1)) + lines (cons (buffer-substring p (point)) lines)))) (sit-for 5) (zone-hiding-modeline (let ((msg "Zoning... (zone-pgm-stress)")) @@ -671,7 +663,8 @@ (setq c (point)) (move-to-column 9) (setq col (cons (buffer-substring (point) c) col)) - (end-of-line 0) +; (let ((inhibit-point-motion-hooks t)) + (end-of-line 0);) (forward-char -10)) (let ((life-patterns (vector (if (and col (search-forward "@" max t))
--- a/lisp/textmodes/ispell.el Tue Jul 06 22:53:26 2010 +0000 +++ b/lisp/textmodes/ispell.el Wed Jul 07 22:09:05 2010 +0000 @@ -357,21 +357,21 @@ :group 'ispell) (defcustom ispell-alternate-dictionary - (cond ((file-exists-p "/usr/dict/web2") "/usr/dict/web2") - ((file-exists-p "/usr/share/dict/web2") "/usr/share/dict/web2") - ((file-exists-p "/usr/dict/words") "/usr/dict/words") - ((file-exists-p "/usr/lib/dict/words") "/usr/lib/dict/words") - ((file-exists-p "/usr/share/dict/words") "/usr/share/dict/words") - ((file-exists-p "/usr/share/lib/dict/words") + (cond ((file-readable-p "/usr/dict/web2") "/usr/dict/web2") + ((file-readable-p "/usr/share/dict/web2") "/usr/share/dict/web2") + ((file-readable-p "/usr/dict/words") "/usr/dict/words") + ((file-readable-p "/usr/lib/dict/words") "/usr/lib/dict/words") + ((file-readable-p "/usr/share/dict/words") "/usr/share/dict/words") + ((file-readable-p "/usr/share/lib/dict/words") "/usr/share/lib/dict/words") - ((file-exists-p "/sys/dict") "/sys/dict") - (t "/usr/dict/words")) - "*Alternate dictionary for spelling help." + ((file-readable-p "/sys/dict") "/sys/dict")) + "*Alternate plain word-list dictionary for spelling help." :type '(choice file (const :tag "None" nil)) :group 'ispell) -(defcustom ispell-complete-word-dict ispell-alternate-dictionary - "*Dictionary used for word completion." +(defcustom ispell-complete-word-dict nil + "*Plain word-list dictionary used for word completion if +different from `ispell-alternate-dictionary'." :type '(choice file (const :tag "None" nil)) :group 'ispell) @@ -2049,10 +2049,11 @@ (erase-buffer) (setq count ?0 skipped 0 - mode-line-format + mode-line-format ;; setup the *Choices* buffer with valid data. (concat "-- %b -- word: " new-word - " -- dict: " - ispell-alternate-dictionary) + " -- word-list: " + (or ispell-complete-word-dict + ispell-alternate-dictionary)) miss (lookup-words new-word) choices miss line ispell-choices-win-default-height) @@ -2267,11 +2268,20 @@ search for the words (usually egrep). Optional second argument contains the dictionary to use; the default is -`ispell-alternate-dictionary'." +`ispell-alternate-dictionary', overriden by `ispell-complete-word-dict' +if defined." ;; We don't use the filter for this function, rather the result is written ;; into a buffer. Hence there is no need to save the filter values. (if (null lookup-dict) - (setq lookup-dict ispell-alternate-dictionary)) + (setq lookup-dict (or ispell-complete-word-dict + ispell-alternate-dictionary))) + + (if lookup-dict + (unless (file-readable-p lookup-dict) + (error "lookup-words error: Unreadable or missing plain word-list %s." + lookup-dict)) + (error (concat "lookup-words error: No plain word-list found at system default " + "locations. Customize `ispell-alternate-dictionary' to set yours."))) (let* ((process-connection-type ispell-use-ptys-p) (wild-p (string-match "\\*" word)) @@ -3342,7 +3352,8 @@ (lookup-words (concat (and interior-frag "*") word (if (or interior-frag (null ispell-look-p)) "*")) - ispell-complete-word-dict))) + (or ispell-complete-word-dict + ispell-alternate-dictionary)))) (cond ((eq possibilities t) (message "No word to complete")) ((null possibilities)
--- a/src/ChangeLog Tue Jul 06 22:53:26 2010 +0000 +++ b/src/ChangeLog Wed Jul 07 22:09:05 2010 +0000 @@ -1,3 +1,54 @@ +2010-07-07 Jan Djärv <jan.h.d@swipnet.se> + + * process.c (kbd_is_on_hold): New variable. + (hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p): New + functions. + (wait_reading_process_output): If kbd_on_hold_p returns non-zero, + select on empty input mask. + (init_process): Initialize kbd_is_on_hold to 0. + + * process.h (hold_keyboard_input, unhold_keyboard_input) + (kbd_on_hold_p): Declare. + + * keyboard.c (input_available_signal): Declare. + (kbd_buffer_nr_stored): New function. + (kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns + more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571). + (kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored + returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571). + (tty_read_avail_input): If input is on hold, return. + Don't read more that free slots in kbd_buffer (Bug#6571). + +2010-07-07 Eli Zaretskii <eliz@gnu.org> + + * msdos.h: + * msdos.c: + * dosfns.c: + * w16select.c: Convert function definitions to ANSI C. + + * msdos.h (ctrl_break_func, install_ctrl_break_check): Remove + unused prototypes. + +2010-07-07 Juanma Barranquero <lekktu@gmail.com> + + * coding.c, sysdep.c: Convert some more functions to standard C. + +2010-07-07 Juanma Barranquero <lekktu@gmail.com> + + * coding.c (decode_coding_gap, encode_coding_gap, decode_coding_object) + (encode_coding_object): Use SPECPDL_INDEX. + (syms_of_coding): Use DOS_NT. + +2010-07-07 Dan Nicolaescu <dann@ics.uci.edu> + + * intervals.h (interval): Use EMACS_UINT instead of unsigned EMACS_INT. + + Make the function member of Lisp_Subr use standard C prototypes. + * lisp.h (struct Lisp_Subr): Use a union for the function member. + (DECL_ALIGN): Add a cast for the function. + * eval.c (Feval, Ffuncall): Use the proper type for each type + function call. + 2010-07-06 Chong Yidong <cyd@stupidchicken.com> * fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
--- a/src/coding.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/coding.c Wed Jul 07 22:09:05 2010 +0000 @@ -154,9 +154,8 @@ #if 0 static int -detect_coding_XXX (coding, detect_info) - struct coding_system *coding; - struct coding_detection_info *detect_info; +detect_coding_XXX (struct coding_system *coding, + struct coding_detection_info *detect_info) { const unsigned char *src = coding->source; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -203,8 +202,7 @@ #if 0 static void -decode_coding_XXXX (coding) - struct coding_system *coding; +decode_coding_XXXX (struct coding_system *coding) { const unsigned char *src = coding->source + coding->consumed; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -261,8 +259,7 @@ Below is a template of these functions. */ #if 0 static void -encode_coding_XXX (coding) - struct coding_system *coding; +encode_coding_XXX (struct coding_system *coding) { int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; @@ -1165,7 +1162,8 @@ } static void -coding_alloc_by_making_gap (struct coding_system *coding, EMACS_INT gap_head_used, EMACS_INT bytes) +coding_alloc_by_making_gap (struct coding_system *coding, + EMACS_INT gap_head_used, EMACS_INT bytes) { if (EQ (coding->src_object, coding->dst_object)) { @@ -1194,7 +1192,8 @@ static unsigned char * -alloc_destination (struct coding_system *coding, EMACS_INT nbytes, unsigned char *dst) +alloc_destination (struct coding_system *coding, EMACS_INT nbytes, + unsigned char *dst) { EMACS_INT offset = dst - coding->destination; @@ -1292,7 +1291,8 @@ #define UTF_8_BOM_3 0xBF static int -detect_coding_utf_8 (struct coding_system *coding, struct coding_detection_info *detect_info) +detect_coding_utf_8 (struct coding_system *coding, + struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -1423,8 +1423,6 @@ } CODING_UTF_8_BOM (coding) = utf_without_bom; - - while (1) { int c, c1, c2, c3, c4, c5; @@ -1447,7 +1445,7 @@ { c = - c1; } - else if (UTF_8_1_OCTET_P(c1)) + else if (UTF_8_1_OCTET_P (c1)) { if (eol_crlf && c1 == '\r') ONE_MORE_BYTE (byte_after_cr); @@ -1610,7 +1608,8 @@ static int -detect_coding_utf_16 (struct coding_system *coding, struct coding_detection_info *detect_info) +detect_coding_utf_16 (struct coding_system *coding, + struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base = src; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -1962,7 +1961,8 @@ else return 0. */ static int -detect_coding_emacs_mule (struct coding_system *coding, struct coding_detection_info *detect_info) +detect_coding_emacs_mule (struct coding_system *coding, + struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -2050,7 +2050,9 @@ -1. If SRC is too short, return -2. */ int -emacs_mule_char (struct coding_system *coding, const unsigned char *src, int *nbytes, int *nchars, int *id, struct composition_status *cmp_status) +emacs_mule_char (struct coding_system *coding, const unsigned char *src, + int *nbytes, int *nchars, int *id, + struct composition_status *cmp_status) { const unsigned char *src_end = coding->source + coding->src_bytes; const unsigned char *src_base = src; @@ -2187,7 +2189,7 @@ (3) alt&rule composition: 0x80 0xF5 BYTES CHARS | ALT RULE ... ALT CHAR ... and these old form: - + (4) relative composition: 0x80 | MSEQ ... MSEQ (5) rulebase composition: 0x80 0xFF | MSEQ MRULE ... MSEQ @@ -2368,7 +2370,8 @@ static int -emacs_mule_finish_composition (int *charbuf, struct composition_status *cmp_status) +emacs_mule_finish_composition (int *charbuf, + struct composition_status *cmp_status) { int idx = - cmp_status->length; int new_chars; @@ -3048,7 +3051,8 @@ If it is, return 1, else return 0. */ static int -detect_coding_iso_2022 (struct coding_system *coding, struct coding_detection_info *detect_info) +detect_coding_iso_2022 (struct coding_system *coding, + struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base = src; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -4284,7 +4288,7 @@ #define ENCODE_ISO_CHARACTER(charset, c) \ do { \ - int code = ENCODE_CHAR ((charset),(c)); \ + int code = ENCODE_CHAR ((charset), (c)); \ \ if (CHARSET_DIMENSION (charset) == 1) \ ENCODE_ISO_CHARACTER_DIMENSION1 ((charset), code); \ @@ -4298,7 +4302,9 @@ Return new DST. */ unsigned char * -encode_invocation_designation (struct charset *charset, struct coding_system *coding, unsigned char *dst, int *p_nchars) +encode_invocation_designation (struct charset *charset, + struct coding_system *coding, + unsigned char *dst, int *p_nchars) { int multibytep = coding->dst_multibyte; int produced_chars = *p_nchars; @@ -4410,7 +4416,8 @@ find all the necessary designations. */ static unsigned char * -encode_designation_at_bol (struct coding_system *coding, int *charbuf, int *charbuf_end, unsigned char *dst) +encode_designation_at_bol (struct coding_system *coding, int *charbuf, + int *charbuf_end, unsigned char *dst) { struct charset *charset; /* Table of charsets to be designated to each graphic register. */ @@ -4650,7 +4657,8 @@ CATEGORY_MASK_SJIS, else return 0. */ static int -detect_coding_sjis (struct coding_system *coding, struct coding_detection_info *detect_info) +detect_coding_sjis (struct coding_system *coding, + struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -4706,7 +4714,8 @@ CATEGORY_MASK_BIG5, else return 0. */ static int -detect_coding_big5 (struct coding_system *coding, struct coding_detection_info *detect_info) +detect_coding_big5 (struct coding_system *coding, + struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -5144,7 +5153,8 @@ CATEGORY_MASK_CCL, else return 0. */ static int -detect_coding_ccl (struct coding_system *coding, struct coding_detection_info *detect_info) +detect_coding_ccl (struct coding_system *coding, + struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -5423,7 +5433,8 @@ is, return 1, else return 0. */ static int -detect_coding_charset (struct coding_system *coding, struct coding_detection_info *detect_info) +detect_coding_charset (struct coding_system *coding, + struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -6168,7 +6179,8 @@ #define MAX_EOL_CHECK_COUNT 3 static int -detect_eol (const unsigned char *source, EMACS_INT src_bytes, enum coding_category category) +detect_eol (const unsigned char *source, EMACS_INT src_bytes, + enum coding_category category) { const unsigned char *src = source, *src_end = src + src_bytes; unsigned char c; @@ -6704,7 +6716,8 @@ static int -produce_chars (struct coding_system *coding, Lisp_Object translation_table, int last_block) +produce_chars (struct coding_system *coding, Lisp_Object translation_table, + int last_block) { unsigned char *dst = coding->destination + coding->produced; unsigned char *dst_end = coding->destination + coding->dst_bytes; @@ -7174,7 +7187,9 @@ return BUF. */ static INLINE int * -handle_composition_annotation (EMACS_INT pos, EMACS_INT limit, struct coding_system *coding, int *buf, EMACS_INT *stop) +handle_composition_annotation (EMACS_INT pos, EMACS_INT limit, + struct coding_system *coding, int *buf, + EMACS_INT *stop) { EMACS_INT start, end; Lisp_Object prop; @@ -7255,7 +7270,9 @@ property value is non-nil (limiting by LIMIT), and return BUF. */ static INLINE int * -handle_charset_annotation (EMACS_INT pos, EMACS_INT limit, struct coding_system *coding, int *buf, EMACS_INT *stop) +handle_charset_annotation (EMACS_INT pos, EMACS_INT limit, + struct coding_system *coding, int *buf, + EMACS_INT *stop) { Lisp_Object val, next; int id; @@ -7275,7 +7292,8 @@ static void -consume_chars (struct coding_system *coding, Lisp_Object translation_table, int max_lookup) +consume_chars (struct coding_system *coding, Lisp_Object translation_table, + int max_lookup) { int *buf = coding->charbuf; int *buf_end = coding->charbuf + coding->charbuf_size; @@ -7560,9 +7578,10 @@ } int -decode_coding_gap (struct coding_system *coding, EMACS_INT chars, EMACS_INT bytes) -{ - int count = specpdl_ptr - specpdl; +decode_coding_gap (struct coding_system *coding, + EMACS_INT chars, EMACS_INT bytes) +{ + int count = SPECPDL_INDEX (); Lisp_Object attrs; code_conversion_save (0, 0); @@ -7605,9 +7624,10 @@ } int -encode_coding_gap (struct coding_system *coding, EMACS_INT chars, EMACS_INT bytes) -{ - int count = specpdl_ptr - specpdl; +encode_coding_gap (struct coding_system *coding, + EMACS_INT chars, EMACS_INT bytes) +{ + int count = SPECPDL_INDEX (); code_conversion_save (0, 0); @@ -7658,14 +7678,13 @@ */ void -decode_coding_object (coding, src_object, from, from_byte, to, to_byte, - dst_object) - struct coding_system *coding; - Lisp_Object src_object; - EMACS_INT from, from_byte, to, to_byte; - Lisp_Object dst_object; -{ - int count = specpdl_ptr - specpdl; +decode_coding_object (struct coding_system *coding, + Lisp_Object src_object, + EMACS_INT from, EMACS_INT from_byte, + EMACS_INT to, EMACS_INT to_byte, + Lisp_Object dst_object) +{ + int count = SPECPDL_INDEX (); unsigned char *destination; EMACS_INT dst_bytes; EMACS_INT chars = to - from; @@ -7849,14 +7868,13 @@ void -encode_coding_object (coding, src_object, from, from_byte, to, to_byte, - dst_object) - struct coding_system *coding; - Lisp_Object src_object; - EMACS_INT from, from_byte, to, to_byte; - Lisp_Object dst_object; -{ - int count = specpdl_ptr - specpdl; +encode_coding_object (struct coding_system *coding, + Lisp_Object src_object, + EMACS_INT from, EMACS_INT from_byte, + EMACS_INT to, EMACS_INT to_byte, + Lisp_Object dst_object) +{ + int count = SPECPDL_INDEX (); EMACS_INT chars = to - from; EMACS_INT bytes = to_byte - from_byte; Lisp_Object attrs; @@ -8162,13 +8180,10 @@ detect only text-format. */ Lisp_Object -detect_coding_system (src, src_chars, src_bytes, highest, multibytep, - coding_system) - const unsigned char *src; - EMACS_INT src_chars, src_bytes; - int highest; - int multibytep; - Lisp_Object coding_system; +detect_coding_system (const unsigned char *src, + EMACS_INT src_chars, EMACS_INT src_bytes, + int highest, int multibytep, + Lisp_Object coding_system) { const unsigned char *src_end = src + src_bytes; Lisp_Object attrs, eol_type; @@ -8922,7 +8937,9 @@ Lisp_Object -code_convert_region (Lisp_Object start, Lisp_Object end, Lisp_Object coding_system, Lisp_Object dst_object, int encodep, int norecord) +code_convert_region (Lisp_Object start, Lisp_Object end, + Lisp_Object coding_system, Lisp_Object dst_object, + int encodep, int norecord) { struct coding_system coding; EMACS_INT from, from_byte, to, to_byte; @@ -9061,7 +9078,8 @@ ENCODE_FILE, thus we ignore character composition. */ Lisp_Object -code_convert_string_norecord (Lisp_Object string, Lisp_Object coding_system, int encodep) +code_convert_string_norecord (Lisp_Object string, Lisp_Object coding_system, + int encodep) { return code_convert_string (string, coding_system, Qt, encodep, 0, 1); } @@ -10096,7 +10114,7 @@ DEFUN ("coding-system-put", Fcoding_system_put, Scoding_system_put, 3, 3, 0, doc: /* Change value in CODING-SYSTEM's property list PROP to VAL. */) - (coding_system, prop, val) + (coding_system, prop, val) Lisp_Object coding_system, prop, val; { Lisp_Object spec, attrs; @@ -10194,7 +10212,7 @@ 1, 1, 0, doc: /* Return the base of CODING-SYSTEM. Any alias or subsidiary coding system is not a base coding system. */) - (coding_system) + (coding_system) Lisp_Object coding_system; { Lisp_Object spec, attrs; @@ -10854,7 +10872,7 @@ for (i = 0; i < coding_category_max; i++) Fset (AREF (Vcoding_category_table, i), Qno_conversion); } -#if defined (MSDOS) || defined (WINDOWSNT) +#if defined (DOS_NT) system_eol_type = Qdos; #else system_eol_type = Qunix;
--- a/src/config.in Tue Jul 06 22:53:26 2010 +0000 +++ b/src/config.in Wed Jul 07 22:09:05 2010 +0000 @@ -1107,11 +1107,6 @@ #define my_strftime nstrftime /* for strftime.c */ -/* Some of the files of Emacs which are intended for use with other - programs assume that if you have a config.h file, you must declare - the type of getenv. */ -extern char *getenv (); - /* These default definitions are good for almost all machines. The exceptions override them in m/MACHINE.h. */
--- a/src/dosfns.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/dosfns.c Wed Jul 07 22:09:05 2010 +0000 @@ -283,7 +283,7 @@ #endif /* !HAVE_X_WINDOWS */ void -init_dosfns () +init_dosfns (void) { union REGS regs; _go32_dpmi_registers dpmiregs; @@ -481,9 +481,7 @@ sets the name in the frame struct, but has no other effects. */ void -x_set_title (f, name) - struct frame *f; - Lisp_Object name; +x_set_title (struct frame *f, Lisp_Object name) { /* Don't change the title if it's already NAME. */ if (EQ (name, f->title)) @@ -536,7 +534,7 @@ (There are no other processes on DOS, right?) */ Lisp_Object -list_system_processes () +list_system_processes (void) { Lisp_Object proclist = Qnil; @@ -689,7 +687,8 @@ /* * Define everything */ -syms_of_dosfns () +void +syms_of_dosfns (void) { defsubr (&Sint86); defsubr (&Sdos_memget);
--- a/src/eval.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/eval.c Wed Jul 07 22:09:05 2010 +0000 @@ -2330,7 +2330,7 @@ if (XSUBR (fun)->max_args == UNEVALLED) { backtrace.evalargs = 0; - val = (*XSUBR (fun)->function) (args_left); + val = (XSUBR (fun)->function.a1) (args_left); goto done; } @@ -2356,7 +2356,7 @@ backtrace.args = vals; backtrace.nargs = XINT (numargs); - val = (*XSUBR (fun)->function) (XINT (numargs), vals); + val = (XSUBR (fun)->function.am) (XINT (numargs), vals); UNGCPRO; goto done; } @@ -2380,40 +2380,40 @@ switch (i) { case 0: - val = (*XSUBR (fun)->function) (); + val = (XSUBR (fun)->function.a0) (); goto done; case 1: - val = (*XSUBR (fun)->function) (argvals[0]); + val = (XSUBR (fun)->function.a1) (argvals[0]); goto done; case 2: - val = (*XSUBR (fun)->function) (argvals[0], argvals[1]); + val = (XSUBR (fun)->function.a2) (argvals[0], argvals[1]); goto done; case 3: - val = (*XSUBR (fun)->function) (argvals[0], argvals[1], - argvals[2]); + val = (XSUBR (fun)->function.a3) (argvals[0], argvals[1], + argvals[2]); goto done; case 4: - val = (*XSUBR (fun)->function) (argvals[0], argvals[1], - argvals[2], argvals[3]); + val = (XSUBR (fun)->function.a4) (argvals[0], argvals[1], + argvals[2], argvals[3]); goto done; case 5: - val = (*XSUBR (fun)->function) (argvals[0], argvals[1], argvals[2], - argvals[3], argvals[4]); + val = (XSUBR (fun)->function.a5) (argvals[0], argvals[1], argvals[2], + argvals[3], argvals[4]); goto done; case 6: - val = (*XSUBR (fun)->function) (argvals[0], argvals[1], argvals[2], - argvals[3], argvals[4], argvals[5]); + val = (XSUBR (fun)->function.a6) (argvals[0], argvals[1], argvals[2], + argvals[3], argvals[4], argvals[5]); goto done; case 7: - val = (*XSUBR (fun)->function) (argvals[0], argvals[1], argvals[2], - argvals[3], argvals[4], argvals[5], - argvals[6]); + val = (XSUBR (fun)->function.a7) (argvals[0], argvals[1], argvals[2], + argvals[3], argvals[4], argvals[5], + argvals[6]); goto done; case 8: - val = (*XSUBR (fun)->function) (argvals[0], argvals[1], argvals[2], - argvals[3], argvals[4], argvals[5], - argvals[6], argvals[7]); + val = (XSUBR (fun)->function.a8) (argvals[0], argvals[1], argvals[2], + argvals[3], argvals[4], argvals[5], + argvals[6], argvals[7]); goto done; default: @@ -3011,7 +3011,7 @@ if (XSUBR (fun)->max_args == MANY) { - val = (*XSUBR (fun)->function) (numargs, args + 1); + val = (XSUBR (fun)->function.am) (numargs, args + 1); goto done; } @@ -3027,44 +3027,44 @@ switch (XSUBR (fun)->max_args) { case 0: - val = (*XSUBR (fun)->function) (); + val = (XSUBR (fun)->function.a0) (); goto done; case 1: - val = (*XSUBR (fun)->function) (internal_args[0]); + val = (XSUBR (fun)->function.a1) (internal_args[0]); goto done; case 2: - val = (*XSUBR (fun)->function) (internal_args[0], internal_args[1]); + val = (XSUBR (fun)->function.a2) (internal_args[0], internal_args[1]); goto done; case 3: - val = (*XSUBR (fun)->function) (internal_args[0], internal_args[1], - internal_args[2]); + val = (XSUBR (fun)->function.a3) (internal_args[0], internal_args[1], + internal_args[2]); goto done; case 4: - val = (*XSUBR (fun)->function) (internal_args[0], internal_args[1], - internal_args[2], internal_args[3]); + val = (XSUBR (fun)->function.a4) (internal_args[0], internal_args[1], + internal_args[2], internal_args[3]); goto done; case 5: - val = (*XSUBR (fun)->function) (internal_args[0], internal_args[1], - internal_args[2], internal_args[3], - internal_args[4]); + val = (XSUBR (fun)->function.a5) (internal_args[0], internal_args[1], + internal_args[2], internal_args[3], + internal_args[4]); goto done; case 6: - val = (*XSUBR (fun)->function) (internal_args[0], internal_args[1], - internal_args[2], internal_args[3], - internal_args[4], internal_args[5]); + val = (XSUBR (fun)->function.a6) (internal_args[0], internal_args[1], + internal_args[2], internal_args[3], + internal_args[4], internal_args[5]); goto done; case 7: - val = (*XSUBR (fun)->function) (internal_args[0], internal_args[1], - internal_args[2], internal_args[3], - internal_args[4], internal_args[5], - internal_args[6]); + val = (XSUBR (fun)->function.a7) (internal_args[0], internal_args[1], + internal_args[2], internal_args[3], + internal_args[4], internal_args[5], + internal_args[6]); goto done; case 8: - val = (*XSUBR (fun)->function) (internal_args[0], internal_args[1], - internal_args[2], internal_args[3], - internal_args[4], internal_args[5], - internal_args[6], internal_args[7]); + val = (XSUBR (fun)->function.a8) (internal_args[0], internal_args[1], + internal_args[2], internal_args[3], + internal_args[4], internal_args[5], + internal_args[6], internal_args[7]); goto done; default:
--- a/src/image.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/image.c Wed Jul 07 22:09:05 2010 +0000 @@ -157,7 +157,7 @@ unsigned long plane_mask, int format) { /* TODO: not sure what this function is supposed to do.. */ - ns_retain_object(pixmap); + ns_retain_object (pixmap); return pixmap; } @@ -165,7 +165,7 @@ unsigned long XGetPixel (XImagePtr ximage, int x, int y) { - return ns_get_pixel(ximage, x, y); + return ns_get_pixel (ximage, x, y); } /* use with imgs created by ns_image_for_XPM; alpha set to 1; @@ -173,7 +173,7 @@ void XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel) { - ns_put_pixel(ximage, x, y, pixel); + ns_put_pixel (ximage, x, y, pixel); } #endif /* HAVE_NS */ @@ -274,7 +274,7 @@ #endif /* HAVE_NTGUI */ #ifdef HAVE_NS - void *bitmap = ns_image_from_XBM(bits, width, height); + void *bitmap = ns_image_from_XBM (bits, width, height); if (!bitmap) return -1; #endif @@ -319,7 +319,7 @@ #ifdef HAVE_NS int id; - void *bitmap = ns_image_from_file(file); + void *bitmap = ns_image_from_file (file); if (!bitmap) return -1; @@ -330,8 +330,8 @@ dpyinfo->bitmaps[id - 1].refcount = 1; dpyinfo->bitmaps[id - 1].file = (char *) xmalloc (SBYTES (file) + 1); dpyinfo->bitmaps[id - 1].depth = 1; - dpyinfo->bitmaps[id - 1].height = ns_image_width(bitmap); - dpyinfo->bitmaps[id - 1].width = ns_image_height(bitmap); + dpyinfo->bitmaps[id - 1].height = ns_image_width (bitmap); + dpyinfo->bitmaps[id - 1].width = ns_image_height (bitmap); strcpy (dpyinfo->bitmaps[id - 1].file, SDATA (file)); return id; #endif @@ -399,7 +399,7 @@ #endif /* HAVE_NTGUI */ #ifdef HAVE_NS - ns_release_object(bm->img); + ns_release_object (bm->img); #endif if (bm->file) @@ -1211,10 +1211,10 @@ #elif defined (HAVE_NS) #define Destroy_Image(ximg, dummy) \ - ns_release_object(ximg) + ns_release_object (ximg) #define Free_Pixmap(display, pixmap) \ - ns_release_object(pixmap) + ns_release_object (pixmap) #else @@ -2099,7 +2099,7 @@ #endif /* HAVE_NTGUI */ #ifdef HAVE_NS - *pixmap = ns_image_for_XPM(width, height, depth); + *pixmap = ns_image_for_XPM (width, height, depth); if (*pixmap == 0) { *ximg = NULL; @@ -2131,7 +2131,7 @@ xfree (ximg); #endif /* HAVE_NTGUI */ #ifdef HAVE_NS - ns_release_object(ximg); + ns_release_object (ximg); #endif /* HAVE_NS */ } } @@ -2162,7 +2162,7 @@ #ifdef HAVE_NS xassert (ximg == pixmap); - ns_retain_object(ximg); + ns_retain_object (ximg); #endif } @@ -2619,7 +2619,7 @@ convert_mono_to_color_image (f, img, fg, bg); #elif defined (HAVE_NS) - img->pixmap = ns_image_from_XBM(data, img->width, img->height); + img->pixmap = ns_image_from_XBM (data, img->width, img->height); #else img->pixmap @@ -2982,7 +2982,7 @@ invertedBits = bits; nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR * img->height; - bits = (char *) alloca(nbytes); + bits = (char *) alloca (nbytes); for (i = 0; i < nbytes; i++) bits[i] = XBM_BIT_SHUFFLE (invertedBits[i]); } @@ -3859,7 +3859,7 @@ if (!(end - s >= 9 && memcmp (s, "/* XPM */", 9) == 0)) goto failure; s += 9; - match(); + match (); expect_ident ("static"); expect_ident ("char"); expect ('*'); @@ -4009,8 +4009,8 @@ (!EQ (color_val, Qt) ? PIX_MASK_DRAW : (have_mask = 1, PIX_MASK_RETAIN))); #else - if (EQ(color_val, Qt)) - ns_set_alpha(ximg, x, y, 0); + if (EQ (color_val, Qt)) + ns_set_alpha (ximg, x, y, 0); #endif } if (y + 1 < height) @@ -4897,7 +4897,7 @@ ? PIX_MASK_DRAW : PIX_MASK_RETAIN)); #else if (XGetPixel (ximg, x, y) == bg) - ns_set_alpha(ximg, x, y, 0); + ns_set_alpha (ximg, x, y, 0); #endif /* HAVE_NS */ #ifndef HAVE_NS /* Fill in the background_transparent field while we have the mask handy. */ @@ -6485,9 +6485,9 @@ static int jpeg_load (struct frame *f, struct image *img) { - return ns_load_image(f, img, - image_spec_value (img->spec, QCfile, NULL), - image_spec_value (img->spec, QCdata, NULL)); + return ns_load_image (f, img, + image_spec_value (img->spec, QCfile, NULL), + image_spec_value (img->spec, QCdata, NULL)); } #endif /* HAVE_NS */ @@ -6912,9 +6912,9 @@ static int tiff_load (struct frame *f, struct image *img) { - return ns_load_image(f, img, - image_spec_value (img->spec, QCfile, NULL), - image_spec_value (img->spec, QCdata, NULL)); + return ns_load_image (f, img, + image_spec_value (img->spec, QCfile, NULL), + image_spec_value (img->spec, QCdata, NULL)); } #endif /* HAVE_NS */ @@ -7342,9 +7342,9 @@ static int gif_load (struct frame *f, struct image *img) { - return ns_load_image(f, img, - image_spec_value (img->spec, QCfile, NULL), - image_spec_value (img->spec, QCdata, NULL)); + return ns_load_image (f, img, + image_spec_value (img->spec, QCfile, NULL), + image_spec_value (img->spec, QCdata, NULL)); } #endif /* HAVE_NS */ @@ -7666,7 +7666,7 @@ background.pixel = FRAME_BACKGROUND_PIXEL (f); x_query_color (f, &background); #else - ns_query_color(FRAME_BACKGROUND_COLOR (f), &background, 1); + ns_query_color (FRAME_BACKGROUND_COLOR (f), &background, 1); #endif }
--- a/src/intervals.h Tue Jul 06 22:53:26 2010 +0000 +++ b/src/intervals.h Wed Jul 07 22:09:05 2010 +0000 @@ -28,8 +28,8 @@ { /* The first group of entries deal with the tree structure. */ - unsigned EMACS_INT total_length; /* Length of myself and both children. */ - unsigned EMACS_INT position; /* Cache of interval's character position. */ + EMACS_UINT total_length; /* Length of myself and both children. */ + EMACS_UINT position; /* Cache of interval's character position. */ /* This field is usually updated simultaneously with an interval traversal, there is no guarantee
--- a/src/keyboard.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/keyboard.c Wed Jul 07 22:09:05 2010 +0000 @@ -635,6 +635,7 @@ static void clear_event (struct input_event *); static Lisp_Object restore_kboard_configuration (Lisp_Object); static SIGTYPE interrupt_signal (int signalnum); +static SIGTYPE input_available_signal (int signo); static void handle_interrupt (void); static void timer_start_idle (void); static void timer_stop_idle (void); @@ -3590,6 +3591,18 @@ return FRAME_KBOARD (XFRAME (frame)); } +/* Return the number of slots occupied in kbd_buffer. */ + +static int +kbd_buffer_nr_stored () +{ + return kbd_fetch_ptr == kbd_store_ptr + ? 0 + : (kbd_fetch_ptr < kbd_store_ptr + ? kbd_store_ptr - kbd_fetch_ptr + : ((kbd_buffer + KBD_BUFFER_SIZE) - kbd_fetch_ptr + + (kbd_store_ptr - kbd_buffer))); +} Lisp_Object Vthrow_on_input; @@ -3711,6 +3724,17 @@ { *kbd_store_ptr = *event; ++kbd_store_ptr; + if (kbd_buffer_nr_stored () > KBD_BUFFER_SIZE/2 && ! kbd_on_hold_p ()) + { + /* Don't read keyboard input until we have processed kbd_buffer. + This happens when pasting text longer than KBD_BUFFER_SIZE/2. */ + hold_keyboard_input (); +#ifdef SIGIO + if (!noninteractive) + signal (SIGIO, SIG_IGN); +#endif + stop_polling (); + } } /* If we're inside while-no-input, and this event qualifies @@ -3866,10 +3890,24 @@ We always read and discard one event. */ static Lisp_Object -kbd_buffer_get_event (KBOARD **kbp, int *used_mouse_menu, struct timeval *end_time) +kbd_buffer_get_event (KBOARD **kbp, + int *used_mouse_menu, + struct timeval *end_time) { register int c; Lisp_Object obj; + + if (kbd_on_hold_p () && kbd_buffer_nr_stored () < KBD_BUFFER_SIZE/4) + { + /* Start reading input again, we have processed enough so we can + accept new events again. */ + unhold_keyboard_input (); +#ifdef SIGIO + if (!noninteractive) + signal (SIGIO, input_available_signal); +#endif /* SIGIO */ + start_polling (); + } if (noninteractive /* In case we are running as a daemon, only do this before @@ -7039,6 +7077,10 @@ int n_to_read, i; struct tty_display_info *tty = terminal->display_info.tty; int nread = 0; + int buffer_free = KBD_BUFFER_SIZE - kbd_buffer_nr_stored () - 1; + + if (kbd_on_hold_p () || buffer_free <= 0) + return 0; if (!terminal->name) /* Don't read from a dead terminal. */ return 0; @@ -7120,6 +7162,10 @@ #endif #endif + /* Don't read more than we can store. */ + if (n_to_read > buffer_free) + n_to_read = buffer_free; + /* Now read; for one reason or another, this will not block. NREAD is set to the number of chars read. */ do
--- a/src/lisp.h Tue Jul 06 22:53:26 2010 +0000 +++ b/src/lisp.h Wed Jul 07 22:09:05 2010 +0000 @@ -965,7 +965,18 @@ struct Lisp_Subr { EMACS_UINT size; - Lisp_Object (*function) (); + union { + Lisp_Object (*a0) (void); + Lisp_Object (*a1) (Lisp_Object); + Lisp_Object (*a2) (Lisp_Object, Lisp_Object); + Lisp_Object (*a3) (Lisp_Object, Lisp_Object, Lisp_Object); + Lisp_Object (*a4) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); + Lisp_Object (*a5) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); + Lisp_Object (*a6) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); + Lisp_Object (*a7) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); + Lisp_Object (*a8) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); + Lisp_Object (*am) (int, Lisp_Object *); + } function; short min_args, max_args; const char *symbol_name; char *intspec; @@ -1768,7 +1779,7 @@ Lisp_Object fnname DEFUN_ARGS_ ## maxargs ; \ DECL_ALIGN (struct Lisp_Subr, sname) = \ { PVEC_SUBR | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)), \ - fnname, minargs, maxargs, lname, intspec, 0}; \ + (Lisp_Object(*)(void)) fnname, minargs, maxargs, lname, intspec, 0}; \ Lisp_Object fnname /* Note that the weird token-substitution semantics of ANSI C makes
--- a/src/msdos.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/msdos.c Wed Jul 07 22:09:05 2010 +0000 @@ -102,7 +102,7 @@ #endif /* not SYSTEM_MALLOC */ static unsigned long -event_timestamp () +event_timestamp (void) { struct time t; unsigned long s; @@ -138,7 +138,7 @@ static int mouse_button_count; void -mouse_on () +mouse_on (void) { union REGS regs; @@ -155,7 +155,7 @@ } void -mouse_off () +mouse_off (void) { union REGS regs; @@ -222,8 +222,7 @@ } void -mouse_moveto (x, y) - int x, y; +mouse_moveto (int x, int y) { union REGS regs; struct tty_display_info *tty = CURTTY (); @@ -237,8 +236,7 @@ } static int -mouse_pressed (b, xp, yp) - int b, *xp, *yp; +mouse_pressed (int b, int *xp, int *yp) { union REGS regs; @@ -253,8 +251,7 @@ } static int -mouse_released (b, xp, yp) - int b, *xp, *yp; +mouse_released (int b, int *xp, int *yp) { union REGS regs; @@ -269,8 +266,7 @@ } static int -mouse_button_depressed (b, xp, yp) - int b, *xp, *yp; +mouse_button_depressed (int b, int *xp, int *yp) { union REGS regs; @@ -288,12 +284,9 @@ } void -mouse_get_pos (f, insist, bar_window, part, x, y, time) - FRAME_PTR *f; - int insist; - Lisp_Object *bar_window, *x, *y; - enum scroll_bar_part *part; - unsigned long *time; +mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window, + enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, + unsigned long *time) { int ix, iy; Lisp_Object frame, tail; @@ -311,7 +304,7 @@ } static void -mouse_check_moved () +mouse_check_moved (void) { int x, y; @@ -338,7 +331,7 @@ } void -mouse_init () +mouse_init (void) { union REGS regs; struct tty_display_info *tty = CURTTY (); @@ -440,10 +433,7 @@ } static void -dos_direct_output (y, x, buf, len) - int x, y; - char *buf; - int len; +dos_direct_output (int y, int x, char *buf, int len) { int t0 = 2 * (x + y * screen_size_X); int t = t0 + (int) ScreenPrimary; @@ -510,8 +500,7 @@ ROWS x COLS frame. */ void -dos_set_window_size (rows, cols) - int *rows, *cols; +dos_set_window_size (int *rows, int *cols) { char video_name[30]; union REGS regs; @@ -620,7 +609,7 @@ the mouse cursor may need to be refreshed. */ static void -mouse_off_maybe () +mouse_off_maybe (void) { int x, y; @@ -1864,10 +1853,7 @@ /* Insert and delete glyphs. */ static void -IT_insert_glyphs (f, start, len) - struct frame *f; - register struct glyph *start; - register int len; +IT_insert_glyphs (struct frame *f, struct glyph *start, int len) { int shift_by_width = screen_size_X - (new_pos_X + len); @@ -1880,18 +1866,14 @@ } static void -IT_delete_glyphs (f, n) - struct frame *f; - register int n; +IT_delete_glyphs (struct frame *f, int n) { abort (); } /* set-window-configuration on window.c needs this. */ void -x_set_menu_bar_lines (f, value, oldval) - struct frame *f; - Lisp_Object value, oldval; +x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { set_menu_bar_lines (f, value, oldval); } @@ -2080,9 +2062,7 @@ } void -IT_set_frame_parameters (f, alist) - struct frame *f; - Lisp_Object alist; +IT_set_frame_parameters (struct frame *f, Lisp_Object alist) { Lisp_Object tail; int i, j, length = XINT (Flength (alist)); @@ -2289,7 +2269,7 @@ /* Do we need the internal terminal? */ void -internal_terminal_init () +internal_terminal_init (void) { static int init_needed = 1; char *term = getenv ("TERM"), *colors; @@ -2425,10 +2405,8 @@ term->read_socket_hook = &tty_read_avail_input; /* from keyboard.c */ } -dos_get_saved_screen (screen, rows, cols) - char **screen; - int *rows; - int *cols; +int +dos_get_saved_screen (char **screen, int *rows, int *cols) { #ifndef HAVE_X_WINDOWS *screen = startup_screen_buffer; @@ -2587,9 +2565,7 @@ static int international_keyboard; int -dos_set_keyboard (code, always) - int code; - int always; +dos_set_keyboard (int code, int always) { int i; _go32_dpmi_registers regs; @@ -2856,8 +2832,7 @@ #define HYPER_P 0x8000 /* pseudo */ static int -dos_get_modifiers (keymask) - int *keymask; +dos_get_modifiers (int *keymask) { union REGS regs; int mask, modifiers = 0; @@ -2939,7 +2914,7 @@ #define NUM_RECENT_DOSKEYS (100) int recent_doskeys_index; /* Index for storing next element into recent_doskeys */ int total_doskeys; /* Total number of elements stored into recent_doskeys */ -Lisp_Object recent_doskeys; /* A vector, holding the last 100 keystrokes */ +Lisp_Object recent_doskeys; /* A vector, holding the last 100 keystrokes */ DEFUN ("recent-doskeys", Frecent_doskeys, Srecent_doskeys, 0, 0, 0, doc: /* Return vector of last 100 keyboard input values seen in dos_rawgetc. @@ -2966,7 +2941,7 @@ /* Get a char from keyboard. Function keys are put into the event queue. */ static int -dos_rawgetc () +dos_rawgetc (void) { struct input_event event; union REGS regs; @@ -3317,8 +3292,8 @@ static int prev_get_char = -1; /* Return 1 if a key is ready to be read without suspending execution. */ - -dos_keysns () +int +dos_keysns (void) { if (prev_get_char != -1) return 1; @@ -3327,8 +3302,8 @@ } /* Read a key. Return -1 if no key is ready. */ - -dos_keyread () +int +dos_keyread (void) { if (prev_get_char != -1) { @@ -3357,7 +3332,7 @@ static int menu_help_paneno, menu_help_itemno; static XMenu * -IT_menu_create () +IT_menu_create (void) { XMenu *menu; @@ -3526,7 +3501,7 @@ /* Report availability of menus. */ int -have_menus_p () { return 1; } +have_menus_p (void) { return 1; } /* Create a brand new menu structure. */ @@ -3884,8 +3859,7 @@ /* Destructively turn backslashes into slashes. */ void -dostounix_filename (p) - register char *p; +dostounix_filename (char *p) { msdos_downcase_filename (p); @@ -3900,8 +3874,7 @@ /* Destructively turn slashes into backslashes. */ void -unixtodos_filename (p) - register char *p; +unixtodos_filename (char *p) { if (p[1] == ':' && *p >= 'A' && *p <= 'Z') { @@ -3920,9 +3893,7 @@ /* Get the default directory for a given drive. 0=def, 1=A, 2=B, ... */ int -getdefdir (drive, dst) - int drive; - char *dst; +getdefdir (int drive, char *dst) { char in_path[4], *p = in_path, e = errno; @@ -3961,9 +3932,7 @@ /* Remove all CR's that are followed by a LF. */ int -crlf_to_lf (n, buf) - register int n; - register unsigned char *buf; +crlf_to_lf (int n, unsigned char *buf) { unsigned char *np = buf, *startp = buf, *endp = buf + n; @@ -3995,8 +3964,7 @@ /* Convert alphabetic characters in a filename to lower-case. */ void -msdos_downcase_filename (p) - register unsigned char *p; +msdos_downcase_filename (unsigned char *p) { /* Always lower-case drive letters a-z, even if the filesystem preserves case in filenames. @@ -4040,8 +4008,7 @@ static char emacsroot[MAXPATHLEN]; char * -rootrelativepath (rel) - char *rel; +rootrelativepath (char *rel) { static char result[MAXPATHLEN + 10]; @@ -4056,10 +4023,7 @@ break if one or more of these are missing. */ void -init_environment (argc, argv, skip_args) - int argc; - char **argv; - int skip_args; +init_environment (int argc, char **argv, int skip_args) { char *s, *t, *root; int len, i; @@ -4293,7 +4257,7 @@ /* Restore status of standard input and Ctrl-C checking. */ int -dos_ttcooked () +dos_ttcooked (void) { union REGS inregs, outregs; @@ -4319,11 +4283,8 @@ file TEMPOUT and stderr to TEMPERR. */ int -run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv) - unsigned char **argv; - const char *working_dir; - int tempin, tempout, temperr; - char **envv; +run_msdos_command (unsigned char **argv, const char *working_dir, + int tempin, int tempout, int temperr, char **envv) { char *saveargv1, *saveargv2, *lowcase_argv0, *pa, *pl; char oldwd[MAXPATHLEN + 1]; /* Fixed size is safe on MSDOS. */ @@ -4464,8 +4425,7 @@ } void -croak (badfunc) - char *badfunc; +croak (char *badfunc) { fprintf (stderr, "%s not yet implemented\r\n", badfunc); reset_all_sys_modes (); @@ -4475,8 +4435,8 @@ /* * A few unimplemented functions that we silently ignore. */ -setpgrp () {return 0; } -setpriority (x,y,z) int x,y,z; { return 0; } +int setpgrp (void) {return 0; } +int setpriority (int x, int y, int z) { return 0; } #if __DJGPP__ == 2 && __DJGPP_MINOR__ < 2 @@ -4501,17 +4461,13 @@ /* A signal handler which just records that a signal occurred (it will be raised later, if and when the signal is unblocked). */ static void -sig_suspender (signo) - int signo; +sig_suspender (int signo) { sigaddset (&msdos_pending_signals, signo); } int -sigprocmask (how, new_set, old_set) - int how; - const sigset_t *new_set; - sigset_t *old_set; +sigprocmask (int how, const sigset_t *new_set, sigset_t *old_set) { int signo; sigset_t new_mask; @@ -4613,10 +4569,8 @@ /* We don't have to call timer_check here because wait_reading_process_output takes care of that. */ int -sys_select (nfds, rfds, wfds, efds, timeout) - int nfds; - SELECT_TYPE *rfds, *wfds, *efds; - EMACS_TIME *timeout; +sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, + EMACS_TIME *timeout) { int check_input; struct time t; @@ -4686,11 +4640,10 @@ #ifdef chdir #undef chdir -extern int chdir (); +extern int chdir (const char *); int -sys_chdir (path) - const char* path; +sys_chdir (const char *path) { int len = strlen (path); char *tmp = (char *)path; @@ -4719,7 +4672,7 @@ extern void tzset (void); void -init_gettimeofday () +init_gettimeofday (void) { time_t ltm, gtm; struct tm *lstm; @@ -4737,9 +4690,7 @@ #ifdef abort #undef abort void -dos_abort (file, line) - char *file; - int line; +dos_abort (char *file, int line) { char buffer1[200], buffer2[400]; int i, j; @@ -4755,7 +4706,7 @@ } #else void -abort () +abort (void) { dos_ttcooked (); ScreenSetCursor (10, 0); @@ -4780,7 +4731,8 @@ static int delete_exited_processes; #endif -syms_of_msdos () +void +syms_of_msdos (void) { recent_doskeys = Fmake_vector (make_number (NUM_RECENT_DOSKEYS), Qnil); staticpro (&recent_doskeys);
--- a/src/msdos.h Tue Jul 06 22:53:26 2010 +0000 +++ b/src/msdos.h Wed Jul 07 22:09:05 2010 +0000 @@ -23,7 +23,7 @@ #include <dpmi.h> int dos_ttraw (struct tty_display_info *); -int dos_ttcooked (); +int dos_ttcooked (void); int dos_get_saved_screen (char **, int *, int *); int dos_set_keyboard (int, int); void dos_set_window_size (int *, int *); @@ -32,15 +32,13 @@ void unixtodos_filename (char *); void dostounix_filename (char *); char *rootrelativepath (char *); -void init_environment (); -void internal_terminal_init (); -void ctrl_break_func (_go32_dpmi_registers *); -void install_ctrl_break_check (); +void init_environment (int, char **, int); +void internal_terminal_init (void); extern int have_mouse; -void mouse_init (); -void mouse_on (); -void mouse_off (); +void mouse_init (void); +void mouse_on (void); +void mouse_off (void); void mouse_moveto (int, int); #ifndef HAVE_X_WINDOWS
--- a/src/process.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/process.c Wed Jul 07 22:09:05 2010 +0000 @@ -306,6 +306,10 @@ static SELECT_TYPE input_wait_mask; +/* Non-zero if keyboard input is on hold, zero otherwise. */ + +static int kbd_is_on_hold; + /* Mask that excludes keyboard input descriptor(s). */ static SELECT_TYPE non_keyboard_wait_mask; @@ -3003,7 +3007,7 @@ p->inherit_coding_system_flag = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); - Fserial_process_configure(nargs, args); + Fserial_process_configure (nargs, args); specpdl_ptr = specpdl + specpdl_count; @@ -3401,7 +3405,7 @@ ret = getaddrinfo (SDATA (host), portstring, &hints, &res); if (ret) #ifdef HAVE_GAI_STRERROR - error ("%s/%s %s", SDATA (host), portstring, gai_strerror(ret)); + error ("%s/%s %s", SDATA (host), portstring, gai_strerror (ret)); #else error ("%s/%s getaddrinfo error %d", SDATA (host), portstring, ret); #endif @@ -3900,7 +3904,7 @@ again: ifaces += 25; - buf_size = ifaces * sizeof(ifreqs[0]); + buf_size = ifaces * sizeof (ifreqs[0]); ifreqs = (struct ifreq *)xrealloc(ifreqs, buf_size); if (!ifreqs) { @@ -4362,7 +4366,7 @@ int i; args[0] = build_string ("%x:%x:%x:%x:%x:%x:%x:%x"); for (i = 0; i < 8; i++) - args[i+1] = make_number (ntohs(ip6[i])); + args[i+1] = make_number (ntohs (ip6[i])); host = Fformat (9, args); service = make_number (ntohs (saddr.in.sin_port)); @@ -4731,7 +4735,10 @@ SELECT_TYPE Ctemp; #endif - Atemp = input_wait_mask; + if (kbd_on_hold_p ()) + FD_ZERO (&Atemp); + else + Atemp = input_wait_mask; IF_NON_BLOCKING_CONNECT (Ctemp = connect_wait_mask); EMACS_SET_SECS_USECS (timeout, 0, 0); @@ -5164,23 +5171,23 @@ /* getsockopt(,,SO_ERROR,,) is said to hang on some systems. So only use it on systems where it is known to work. */ { - int xlen = sizeof(xerrno); - if (getsockopt(channel, SOL_SOCKET, SO_ERROR, &xerrno, &xlen)) + int xlen = sizeof (xerrno); + if (getsockopt (channel, SOL_SOCKET, SO_ERROR, &xerrno, &xlen)) xerrno = errno; } #else { struct sockaddr pname; - int pnamelen = sizeof(pname); + int pnamelen = sizeof (pname); /* If connection failed, getpeername will fail. */ xerrno = 0; - if (getpeername(channel, &pname, &pnamelen) < 0) + if (getpeername (channel, &pname, &pnamelen) < 0) { /* Obtain connect failure code through error slippage. */ char dummy; xerrno = errno; - if (errno == ENOTCONN && read(channel, &dummy, 1) < 0) + if (errno == ENOTCONN && read (channel, &dummy, 1) < 0) xerrno = errno; } } @@ -6336,7 +6343,7 @@ CHECK_SYMBOL (sigcode); name = SDATA (SYMBOL_NAME (sigcode)); - if (!strncmp(name, "SIG", 3) || !strncmp(name, "sig", 3)) + if (!strncmp (name, "SIG", 3) || !strncmp (name, "sig", 3)) name += 3; if (0) @@ -7010,6 +7017,30 @@ +/* Stop reading input from keyboard sources. */ + +void +hold_keyboard_input (void) +{ + kbd_is_on_hold = 1; +} + +/* Resume reading input from keyboard sources. */ + +void +unhold_keyboard_input (void) +{ + kbd_is_on_hold = 0; +} + +/* Return non-zero if keyboard input is on hold, zero otherwise. */ + +int +kbd_on_hold_p (void) +{ + return kbd_is_on_hold; +} + /* Add DESC to the set of keyboard input descriptors. */ void @@ -7252,7 +7283,7 @@ processes. As such, we only change the default value. */ if (initialized) { - char *release = get_operating_system_release(); + char *release = get_operating_system_release (); if (!release || !release[0] || (release[0] < MIN_PTY_KERNEL_VERSION && release[1] == '.')) { Vprocess_connection_type = Qnil; @@ -7901,6 +7932,7 @@ void init_process () { + kbd_is_on_hold = 0; } void
--- a/src/process.h Tue Jul 06 22:53:26 2010 +0000 +++ b/src/process.h Wed Jul 07 22:09:05 2010 +0000 @@ -170,5 +170,9 @@ extern Lisp_Object list_system_processes (void); extern Lisp_Object system_process_attributes (Lisp_Object); +extern void hold_keyboard_input (void); +extern void unhold_keyboard_input (void); +extern int kbd_on_hold_p (void); + /* arch-tag: dffedfc4-d7bc-4b58-a26f-c16155449c72 (do not change this comment) */
--- a/src/sysdep.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/sysdep.c Wed Jul 07 22:09:05 2010 +0000 @@ -182,7 +182,7 @@ Any other returned value must be freed with free. This is used only when get_current_dir_name is not defined on the system. */ char* -get_current_dir_name () +get_current_dir_name (void) { char *buf; char *pwd; @@ -363,7 +363,8 @@ #ifndef subprocesses -wait_without_blocking () +void +wait_without_blocking (void) { croak ("wait_without_blocking"); synch_process_alive = 0; @@ -800,7 +801,7 @@ void unrequest_sigio (void) -{ +{ if (noninteractive) return; @@ -820,7 +821,7 @@ #ifndef MSDOS void -request_sigio () +request_sigio (void) { if (noninteractive || read_socket_hook) return; @@ -829,7 +830,7 @@ } void -unrequest_sigio () +unrequest_sigio (void) { if (noninteractive || read_socket_hook) return; @@ -1019,10 +1020,10 @@ if (!tty_out->output) return; /* The tty is suspended. */ - + if (! tty_out->old_tty) tty_out->old_tty = (struct emacs_tty *) xmalloc (sizeof (struct emacs_tty)); - + EMACS_GET_TTY (fileno (tty_out->input), tty_out->old_tty); tty = *tty_out->old_tty; @@ -1080,7 +1081,7 @@ means that the interrupt and quit feature must be disabled on secondary ttys, or we would not even see the keypress. - + Note that even though emacsclient could have special code to pass SIGINT to Emacs, we should _not_ enable interrupt/quit keys for emacsclient frames. This means @@ -1098,7 +1099,7 @@ tty.main.c_cc[VSWTCH] = CDISABLE; /* Turn off shell layering use of C-z */ #endif /* VSWTCH */ - + #if defined (__mips__) || defined (HAVE_TCATTR) #ifdef VSUSP tty.main.c_cc[VSUSP] = CDISABLE; /* Turn off mips handling of C-z. */ @@ -1189,9 +1190,9 @@ tty.tchars.t_startc = '\021'; tty.tchars.t_stopc = '\023'; } - + tty.lmode = LDECCTQ | LLITOUT | LPASS8 | LNOFLSH | tty_out->old_tty.lmode; - + #endif /* HAVE_TCHARS */ #endif /* not HAVE_TERMIO */ @@ -1411,11 +1412,11 @@ if (!tty_out->output) return; /* The tty is suspended. */ - + /* Go to and clear the last line of the terminal. */ cmgoto (tty_out, FrameRows (tty_out) - 1, 0); - + /* Code adapted from tty_clear_end_of_line. */ if (tty_out->TS_clr_line) { @@ -1425,16 +1426,16 @@ { /* have to do it the hard way */ int i; tty_turn_off_insert (tty_out); - + for (i = curX (tty_out); i < FrameCols (tty_out) - 1; i++) { fputc (' ', tty_out->output); } } - + cmgoto (tty_out, FrameRows (tty_out) - 1, 0); fflush (tty_out->output); - + if (tty_out->terminal->reset_terminal_modes_hook) tty_out->terminal->reset_terminal_modes_hook (tty_out->terminal); @@ -1645,7 +1646,7 @@ struct addrinfo hints; int ret; - memset (&hints, 0, sizeof(hints)); + memset (&hints, 0, sizeof (hints)); hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; @@ -1757,8 +1758,8 @@ int read_alarm_should_throw; -SIGTYPE -select_alarm () +void +select_alarm (int ignore) { select_alarmed = 1; signal (SIGALRM, SIG_IGN); @@ -1770,13 +1771,12 @@ #ifndef WINDOWSNT /* Only rfds are checked. */ int -sys_select (nfds, rfds, wfds, efds, timeout) - int nfds; - SELECT_TYPE *rfds, *wfds, *efds; - EMACS_TIME *timeout; +sys_select (int nfds, + SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, + EMACS_TIME *timeout) { /* XXX This needs to be updated for multi-tty support. Is there - anybody who needs to emulate select these days? */ + anybody who needs to emulate select these days? */ int ravail = 0; SELECT_TYPE orfds; int timeoutval; @@ -1907,7 +1907,7 @@ waiting for at least one character. */ void -read_input_waiting () +read_input_waiting (void) { /* XXX This needs to be updated for multi-tty support. Is there anybody who needs to emulate select these days? */ @@ -2421,11 +2421,10 @@ #ifndef HAVE_GETWD char * -getwd (pathname) - char *pathname; +getwd (char *pathname) { char *npath, *spath; - extern char *getcwd (); + extern char *getcwd (char *, size_t); BLOCK_INPUT; /* getcwd uses malloc */ spath = npath = getcwd ((char *) 0, MAXPATHLEN); @@ -2454,9 +2453,8 @@ #ifndef HAVE_RENAME -rename (from, to) - const char *from; - const char *to; +int +rename (const char *from, const char *to) { if (access (from, 0) == 0) { @@ -2476,7 +2474,8 @@ /* HPUX curses library references perror, but as far as we know it won't be called. Anyway this definition will do for now. */ -perror () +void +perror (void) { } #endif /* HPUX and not HAVE_PERROR */ @@ -2489,9 +2488,8 @@ * until we are, then close the unsuccessful ones. */ -dup2 (oldd, newd) - int oldd; - int newd; +int +dup2 (int oldd, int newd) { register int fd, ret; @@ -2525,11 +2523,9 @@ /* ARGSUSED */ int -gettimeofday (tp, tzp) - struct timeval *tp; - struct timezone *tzp; +gettimeofday (struct timeval *tp, struct timezone *tzp) { - extern long time (); + extern long time (long); tp->tv_sec = time ((long *)0); tp->tv_usec = 0; @@ -2616,9 +2612,7 @@ * Make a directory. */ int -mkdir (dpath, dmode) - char *dpath; - int dmode; +mkdir (char *dpath, int dmode) { int cpid, status, fd; struct stat statbuf; @@ -2676,8 +2670,7 @@ #ifndef HAVE_RMDIR int -rmdir (dpath) - char *dpath; +rmdir (char *dpath) { int cpid, status, fd; struct stat statbuf; @@ -2724,8 +2717,7 @@ #ifndef HAVE_STRSIGNAL char * -strsignal (code) - int code; +strsignal (int code) { char *signame = 0; @@ -2741,7 +2733,8 @@ #ifdef HAVE_TERMIOS /* For make-serial-process */ -int serial_open (char *port) +int +serial_open (char *port) { int fd = -1; @@ -2774,7 +2767,8 @@ #if !defined (HAVE_CFMAKERAW) /* Workaround for targets which are missing cfmakeraw. */ /* Pasted from man page. */ -static void cfmakeraw (struct termios *termios_p) +static void +cfmakeraw (struct termios *termios_p) { termios_p->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON); termios_p->c_oflag &= ~OPOST; @@ -2786,7 +2780,8 @@ #if !defined (HAVE_CFSETSPEED) /* Workaround for targets which are missing cfsetspeed. */ -static int cfsetspeed (struct termios *termios_p, speed_t vitesse) +static int +cfsetspeed (struct termios *termios_p, speed_t vitesse) { return (cfsetispeed (termios_p, vitesse) + cfsetospeed (termios_p, vitesse)); @@ -2796,7 +2791,7 @@ /* For serial-process-configure */ void serial_configure (struct Lisp_Process *p, - Lisp_Object contact) + Lisp_Object contact) { Lisp_Object childp2 = Qnil; Lisp_Object tem = Qnil; @@ -2839,7 +2834,7 @@ CHECK_NUMBER (tem); if (XINT (tem) != 7 && XINT (tem) != 8) error (":bytesize must be nil (8), 7, or 8"); - summary[0] = XINT(tem) + '0'; + summary[0] = XINT (tem) + '0'; #if defined (CSIZE) && defined (CS7) && defined (CS8) attr.c_cflag &= ~CSIZE; attr.c_cflag |= ((XINT (tem) == 7) ? CS7 : CS8); @@ -2997,7 +2992,7 @@ #elif !defined (WINDOWSNT) && !defined (MSDOS) Lisp_Object -list_system_processes () +list_system_processes (void) { return Qnil; } @@ -3196,7 +3191,7 @@ procfn_end = fn + strlen (fn); strcpy (procfn_end, "/stat"); fd = emacs_open (fn, O_RDONLY, 0); - if (fd >= 0 && (nread = emacs_read (fd, procbuf, sizeof(procbuf) - 1)) > 0) + if (fd >= 0 && (nread = emacs_read (fd, procbuf, sizeof (procbuf) - 1)) > 0) { procbuf[nread] = '\0'; p = procbuf; @@ -3457,7 +3452,7 @@ strcpy (procfn_end, "/psinfo"); fd = emacs_open (fn, O_RDONLY, 0); if (fd >= 0 - && (nread = read (fd, (char*)&pinfo, sizeof(struct psinfo)) > 0)) + && (nread = read (fd, (char*)&pinfo, sizeof (struct psinfo)) > 0)) { attrs = Fcons (Fcons (Qppid, make_fixnum_or_float (pinfo.pr_ppid)), attrs); attrs = Fcons (Fcons (Qpgrp, make_fixnum_or_float (pinfo.pr_pgid)), attrs);
--- a/src/w16select.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w16select.c Wed Jul 07 22:09:05 2010 +0000 @@ -109,7 +109,7 @@ /* Return the WinOldAp support version, or 0x1700 if not supported. */ unsigned -identify_winoldap_version () +identify_winoldap_version (void) { __dpmi_regs regs; @@ -124,7 +124,7 @@ /* Open the clipboard, return non-zero if successfull. */ unsigned -open_clipboard () +open_clipboard (void) { __dpmi_regs regs; @@ -147,7 +147,7 @@ /* Empty clipboard, return non-zero if successfull. */ unsigned -empty_clipboard () +empty_clipboard (void) { __dpmi_regs regs; @@ -162,8 +162,7 @@ /* Ensure we have a buffer in low memory with enough memory for data of size WANT_SIZE. Return the linear address of the buffer. */ static unsigned long -alloc_xfer_buf (want_size) - unsigned want_size; +alloc_xfer_buf (unsigned want_size) { __dpmi_regs regs; @@ -200,7 +199,7 @@ The clipboard buffer tends to be large in size, because for small clipboard data sizes we use the DJGPP transfer buffer. */ static void -free_xfer_buf () +free_xfer_buf (void) { /* If the size is 0, we used DJGPP transfer buffer, so don't free. */ if (clipboard_xfer_buf_info.size) @@ -218,11 +217,7 @@ /* Copy data into the clipboard, return zero if successfull. */ unsigned -set_clipboard_data (Format, Data, Size, Raw) - unsigned Format; - void *Data; - unsigned Size; - int Raw; +set_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw) { __dpmi_regs regs; unsigned truelen; @@ -321,8 +316,7 @@ /* Return the size of the clipboard data of format FORMAT. */ unsigned -get_clipboard_data_size (Format) - unsigned Format; +get_clipboard_data_size (unsigned Format) { __dpmi_regs regs; @@ -342,11 +336,7 @@ Warning: this doesn't check whether DATA has enough space to hold SIZE bytes. */ unsigned -get_clipboard_data (Format, Data, Size, Raw) - unsigned Format; - void *Data; - unsigned Size; - int Raw; +get_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw) { __dpmi_regs regs; unsigned long xbuf_addr; @@ -425,7 +415,7 @@ /* Close clipboard, return non-zero if successfull. */ unsigned -close_clipboard () +close_clipboard (void) { __dpmi_regs regs; @@ -439,8 +429,7 @@ /* Compact clipboard data so that at least SIZE bytes is available. */ unsigned -clipboard_compact (Size) - unsigned Size; +clipboard_compact (unsigned Size) { __dpmi_regs regs; @@ -705,7 +694,7 @@ } void -syms_of_win16select () +syms_of_win16select (void) { defsubr (&Sw16_set_clipboard_data); defsubr (&Sw16_get_clipboard_data);
--- a/src/w32.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32.c Wed Jul 07 22:09:05 2010 +0000 @@ -315,8 +315,8 @@ if (g_b_init_is_windows_9x == 0) { g_b_init_is_windows_9x = 1; - ZeroMemory(&os_ver, sizeof(OSVERSIONINFO)); - os_ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + ZeroMemory (&os_ver, sizeof (OSVERSIONINFO)); + os_ver.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); if (GetVersionEx (&os_ver)) { s_b_ret = (os_ver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS); @@ -334,7 +334,7 @@ if (get_process_times_fn) { FILETIME create, exit, kernel, user; - HANDLE proc = GetCurrentProcess(); + HANDLE proc = GetCurrentProcess (); if ((*get_process_times_fn) (proc, &create, &exit, &kernel, &user)) { LARGE_INTEGER user_int, kernel_int, total; @@ -753,7 +753,7 @@ lpSystemInfo->dwNumberOfProcessors = -1; } -BOOL WINAPI get_system_times( +BOOL WINAPI get_system_times ( LPFILETIME lpIdleTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime) @@ -1634,7 +1634,7 @@ {"LANG", NULL}, }; -#define N_ENV_VARS sizeof(dflt_envvars)/sizeof(dflt_envvars[0]) +#define N_ENV_VARS sizeof (dflt_envvars)/sizeof (dflt_envvars[0]) /* We need to copy dflt_envvars[] and work on the copy because we don't want the dumped Emacs to inherit the values of @@ -1707,7 +1707,7 @@ for (p = modname; *p; p++) if (*p == '\\') *p = '/'; - _snprintf (buf, sizeof(buf)-1, "emacs_dir=%s", modname); + _snprintf (buf, sizeof (buf)-1, "emacs_dir=%s", modname); _putenv (strdup (buf)); } /* Handle running emacs from the build directory: src/oo-spd/i386/ */ @@ -1731,7 +1731,7 @@ for (p = modname; *p; p++) if (*p == '\\') *p = '/'; - _snprintf (buf, sizeof(buf)-1, "emacs_dir=%s", modname); + _snprintf (buf, sizeof (buf)-1, "emacs_dir=%s", modname); _putenv (strdup (buf)); } } @@ -1759,12 +1759,12 @@ char buf1[SET_ENV_BUF_SIZE], buf2[SET_ENV_BUF_SIZE]; if (dwType == REG_EXPAND_SZ) - ExpandEnvironmentStrings ((LPSTR) lpval, buf1, sizeof(buf1)); + ExpandEnvironmentStrings ((LPSTR) lpval, buf1, sizeof (buf1)); else if (dwType == REG_SZ) strcpy (buf1, lpval); if (dwType == REG_EXPAND_SZ || dwType == REG_SZ) { - _snprintf (buf2, sizeof(buf2)-1, "%s=%s", env_vars[i].name, + _snprintf (buf2, sizeof (buf2)-1, "%s=%s", env_vars[i].name, buf1); _putenv (strdup (buf2)); } @@ -2107,7 +2107,7 @@ involve network access, and so is extremely quick). */ /* Map drive letter to UNC if remote. */ - if ( isalpha( root_dir[0] ) && !fixed[ DRIVE_INDEX( root_dir[0] ) ] ) + if (isalpha (root_dir[0]) && !fixed[DRIVE_INDEX (root_dir[0])]) { char remote_name[ 256 ]; char drive[3] = { root_dir[0], ':' }; @@ -2506,8 +2506,8 @@ nr.lpComment = NULL; nr.lpProvider = NULL; - result = WNetOpenEnum(RESOURCE_GLOBALNET, RESOURCETYPE_DISK, - RESOURCEUSAGE_CONNECTABLE, &nr, &henum); + result = WNetOpenEnum (RESOURCE_GLOBALNET, RESOURCETYPE_DISK, + RESOURCEUSAGE_CONNECTABLE, &nr, &henum); if (result == NO_ERROR) return henum; @@ -2770,7 +2770,7 @@ data.wid.dwStreamId = BACKUP_LINK; data.wid.dwStreamAttributes = 0; - data.wid.Size.LowPart = wlen * sizeof(WCHAR); + data.wid.Size.LowPart = wlen * sizeof (WCHAR); data.wid.Size.HighPart = 0; data.wid.dwStreamNameSize = 0; @@ -3183,7 +3183,7 @@ char name[UNLEN+1]; DWORD name_len = sizeof (name); char domain[1024]; - DWORD domain_len = sizeof(domain); + DWORD domain_len = sizeof (domain); char *mp = NULL; int use_dflt = 0; int result; @@ -3658,7 +3658,7 @@ /* Helper wrapper functions. */ -HANDLE WINAPI create_toolhelp32_snapshot( +HANDLE WINAPI create_toolhelp32_snapshot ( DWORD Flags, DWORD Ignored) { @@ -3678,7 +3678,7 @@ return (s_pfn_Create_Toolhelp32_Snapshot (Flags, Ignored)); } -BOOL WINAPI process32_first( +BOOL WINAPI process32_first ( HANDLE hSnapshot, LPPROCESSENTRY32 lppe) { @@ -3698,7 +3698,7 @@ return (s_pfn_Process32_First (hSnapshot, lppe)); } -BOOL WINAPI process32_next( +BOOL WINAPI process32_next ( HANDLE hSnapshot, LPPROCESSENTRY32 lppe) { @@ -4006,8 +4006,8 @@ if (!h_proc || !get_process_times_fn - || !(*get_process_times_fn)(h_proc, &ft_creation, &ft_exit, - &ft_kernel, &ft_user)) + || !(*get_process_times_fn) (h_proc, &ft_creation, &ft_exit, + &ft_kernel, &ft_user)) return 0; GetSystemTimeAsFileTime (&ft_current); @@ -4448,34 +4448,34 @@ if ((pfn_##fn = (void *) GetProcAddress (winsock_lib, #fn)) == NULL) \ goto fail; - LOAD_PROC( WSAStartup ); - LOAD_PROC( WSASetLastError ); - LOAD_PROC( WSAGetLastError ); - LOAD_PROC( WSAEventSelect ); - LOAD_PROC( WSACreateEvent ); - LOAD_PROC( WSACloseEvent ); - LOAD_PROC( socket ); - LOAD_PROC( bind ); - LOAD_PROC( connect ); - LOAD_PROC( ioctlsocket ); - LOAD_PROC( recv ); - LOAD_PROC( send ); - LOAD_PROC( closesocket ); - LOAD_PROC( shutdown ); - LOAD_PROC( htons ); - LOAD_PROC( ntohs ); - LOAD_PROC( inet_addr ); - LOAD_PROC( gethostname ); - LOAD_PROC( gethostbyname ); - LOAD_PROC( getservbyname ); - LOAD_PROC( getpeername ); - LOAD_PROC( WSACleanup ); - LOAD_PROC( setsockopt ); - LOAD_PROC( listen ); - LOAD_PROC( getsockname ); - LOAD_PROC( accept ); - LOAD_PROC( recvfrom ); - LOAD_PROC( sendto ); + LOAD_PROC (WSAStartup); + LOAD_PROC (WSASetLastError); + LOAD_PROC (WSAGetLastError); + LOAD_PROC (WSAEventSelect); + LOAD_PROC (WSACreateEvent); + LOAD_PROC (WSACloseEvent); + LOAD_PROC (socket); + LOAD_PROC (bind); + LOAD_PROC (connect); + LOAD_PROC (ioctlsocket); + LOAD_PROC (recv); + LOAD_PROC (send); + LOAD_PROC (closesocket); + LOAD_PROC (shutdown); + LOAD_PROC (htons); + LOAD_PROC (ntohs); + LOAD_PROC (inet_addr); + LOAD_PROC (gethostname); + LOAD_PROC (gethostbyname); + LOAD_PROC (getservbyname); + LOAD_PROC (getpeername); + LOAD_PROC (WSACleanup); + LOAD_PROC (setsockopt); + LOAD_PROC (listen); + LOAD_PROC (getsockname); + LOAD_PROC (accept); + LOAD_PROC (recvfrom); + LOAD_PROC (sendto); #undef LOAD_PROC /* specify version 1.1 of winsock */ @@ -4620,7 +4620,7 @@ }; char * -sys_strerror(int error_no) +sys_strerror (int error_no) { int i; static char unknown_msg[40]; @@ -4632,7 +4632,7 @@ if (_wsa_errlist[i].errnum == error_no) return _wsa_errlist[i].msg; - sprintf(unknown_msg, "Unidentified error: %d", error_no); + sprintf (unknown_msg, "Unidentified error: %d", error_no); return unknown_msg; } @@ -4651,7 +4651,7 @@ int socket_to_fd (SOCKET s); int -sys_socket(int af, int type, int protocol) +sys_socket (int af, int type, int protocol) { SOCKET s; @@ -4854,7 +4854,7 @@ } struct hostent * -sys_gethostbyname(const char * name) +sys_gethostbyname (const char * name) { struct hostent * host; @@ -4872,7 +4872,7 @@ } struct servent * -sys_getservbyname(const char * name, const char * proto) +sys_getservbyname (const char * name, const char * proto) { struct servent * serv; @@ -5525,8 +5525,8 @@ int res = pfn_recv (SOCK_HANDLE (fd), buffer, count, 0); if (res == SOCKET_ERROR) { - DebPrint(("sys_read.recv failed with error %d on socket %ld\n", - pfn_WSAGetLastError (), SOCK_HANDLE (fd))); + DebPrint (("sys_read.recv failed with error %d on socket %ld\n", + pfn_WSAGetLastError (), SOCK_HANDLE (fd))); set_errno (); return -1; } @@ -5682,8 +5682,8 @@ if (nchars == SOCKET_ERROR) { - DebPrint(("sys_write.send failed with error %d on socket %ld\n", - pfn_WSAGetLastError (), SOCK_HANDLE (fd))); + DebPrint (("sys_write.send failed with error %d on socket %ld\n", + pfn_WSAGetLastError (), SOCK_HANDLE (fd))); set_errno (); } } @@ -5898,7 +5898,7 @@ up to date when the user logs off, or the system shuts down. */ BOOL WINAPI -shutdown_handler(DWORD type) +shutdown_handler (DWORD type) { /* Ctrl-C and Ctrl-Break are already suppressed, so don't handle them. */ if (type == CTRL_CLOSE_EVENT /* User closes console window. */ @@ -5957,7 +5957,7 @@ console apps. This actually applies to Emacs in both console and GUI modes, since we had to fool windows into thinking emacs is a console application to get console mode to work. */ - SetConsoleCtrlHandler(shutdown_handler, TRUE); + SetConsoleCtrlHandler (shutdown_handler, TRUE); /* "None" is the default group name on standalone workstations. */ strcpy (dflt_group_name, "None");
--- a/src/w32console.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32console.c Wed Jul 07 22:09:05 2010 +0000 @@ -493,7 +493,7 @@ ***********************************************************************/ void -sys_tputs (char *str, int nlines, int (*outfun)(int)) +sys_tputs (char *str, int nlines, int (*outfun) (int)) { } @@ -671,8 +671,8 @@ /* Respect setting of LINES and COLUMNS environment variables. */ { - char * lines = getenv("LINES"); - char * columns = getenv("COLUMNS"); + char * lines = getenv ("LINES"); + char * columns = getenv ("COLUMNS"); if (lines != NULL && columns != NULL) {
--- a/src/w32fns.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32fns.c Wed Jul 07 22:09:05 2010 +0000 @@ -3094,7 +3094,7 @@ wmsg.dwModifiers = w32_get_key_modifiers (wParam, lParam); /* Get buffer size. */ size = get_composition_string_fn (context, GCS_RESULTSTR, buffer, 0); - buffer = alloca(size); + buffer = alloca (size); size = get_composition_string_fn (context, GCS_RESULTSTR, buffer, size); release_ime_context_fn (hwnd, context);
--- a/src/w32font.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32font.c Wed Jul 07 22:09:05 2010 +0000 @@ -549,7 +549,7 @@ /* Save clip region for later restoration. */ orig_clip = CreateRectRgn (0, 0, 0, 0); - if (!GetClipRgn(s->hdc, orig_clip)) + if (!GetClipRgn (s->hdc, orig_clip)) { DeleteObject (orig_clip); orig_clip = NULL; @@ -1785,7 +1785,7 @@ return font_type == TRUETYPE_FONTTYPE ? Qiso10646_1 : Qunknown; charset = w32_to_x_charset (w32_charset, NULL); - return font_intern_prop (charset, strlen(charset), 1); + return font_intern_prop (charset, strlen (charset), 1); } static int
--- a/src/w32inevt.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32inevt.c Wed Jul 07 22:09:05 2010 +0000 @@ -582,8 +582,8 @@ *part = 0; SELECTED_FRAME ()->mouse_moved = 0; - XSETINT(*x, movement_pos.X); - XSETINT(*y, movement_pos.Y); + XSETINT (*x, movement_pos.X); + XSETINT (*y, movement_pos.Y); *time = movement_time; UNBLOCK_INPUT;
--- a/src/w32menu.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32menu.c Wed Jul 07 22:09:05 2010 +0000 @@ -1118,7 +1118,7 @@ /* Frame title: 'Q' = Question, 'I' = Information. Can also have 'E' = Error if, one day, we want a popup for errors. */ - if (NILP(header)) + if (NILP (header)) dialog_name[0] = 'Q'; else dialog_name[0] = 'I';
--- a/src/w32proc.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32proc.c Wed Jul 07 22:09:05 2010 +0000 @@ -46,7 +46,7 @@ #include <windows.h> #ifdef __GNUC__ /* This definition is missing from mingw32 headers. */ -extern BOOL WINAPI IsValidLocale(LCID, DWORD); +extern BOOL WINAPI IsValidLocale (LCID, DWORD); #endif #ifdef HAVE_LANGINFO_CODESET @@ -130,7 +130,7 @@ } #endif -typedef void (_CALLBACK_ *signal_handler)(int); +typedef void (_CALLBACK_ *signal_handler) (int); /* Signal handlers...SIG_DFL == 0 so this is initialized correctly. */ static signal_handler sig_handlers[NSIG]; @@ -176,7 +176,7 @@ cp = &child_procs[child_proc_count++]; Initialise: - memset (cp, 0, sizeof(*cp)); + memset (cp, 0, sizeof (*cp)); cp->fd = -1; cp->pid = -1; cp->procinfo.hProcess = NULL; @@ -399,7 +399,7 @@ return TRUE; EH_Fail: - DebPrint (("create_child.CreateProcess failed: %ld\n", GetLastError());); + DebPrint (("create_child.CreateProcess failed: %ld\n", GetLastError ());); return FALSE; } @@ -2015,7 +2015,7 @@ static char hex[] = "0123456789abcdefABCDEF"; char * p; - while (*s && (p = strchr(hex, *s)) != NULL) + while (*s && (p = strchr (hex, *s)) != NULL) { unsigned digit = p - hex; if (digit > 15)
--- a/src/w32select.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32select.c Wed Jul 07 22:09:05 2010 +0000 @@ -224,7 +224,7 @@ SDATA (SYMBOL_NAME (coding_system)))); setup_windows_coding_system (coding_system, &coding); - coding.dst_bytes = SBYTES(current_text) * 2; + coding.dst_bytes = SBYTES (current_text) * 2; coding.destination = (unsigned char *) xmalloc (coding.dst_bytes); encode_coding_object (&coding, current_text, 0, 0, SCHARS (current_text), SBYTES (current_text), Qnil); @@ -290,7 +290,7 @@ if (SetClipboardData (format, htext) == NULL) { - GlobalFree(htext); + GlobalFree (htext); return Qnil; } @@ -314,7 +314,7 @@ if ((lcid_ptr = (LCID *) GlobalLock (hlocale)) == NULL) { - GlobalFree(hlocale); + GlobalFree (hlocale); return Qnil; } @@ -323,7 +323,7 @@ if (SetClipboardData (CF_LOCALE, hlocale) == NULL) { - GlobalFree(hlocale); + GlobalFree (hlocale); return Qnil; } @@ -380,7 +380,7 @@ automatic conversions anywhere else, so to get consistent results, we probably don't want to rely on it here either. */ - render_locale(); + render_locale (); if (current_clipboard_type == CF_UNICODETEXT) render (make_number (CF_TEXT)); @@ -744,7 +744,7 @@ /* If we have something non-ASCII we may want to set a locale. We do that directly (non-delayed), as it's just a small bit. */ if (ok) - ok = !NILP(render_locale()); + ok = !NILP (render_locale ()); if (ok) { @@ -753,7 +753,7 @@ /* If for some reason we don't have a clipboard_owner, we just set the text format as chosen by the configuration and than forget about the whole thing. */ - ok = !NILP(render (make_number (current_clipboard_type))); + ok = !NILP (render (make_number (current_clipboard_type))); current_text = Qnil; current_coding_system = Qnil; }
--- a/src/w32term.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32term.c Wed Jul 07 22:09:05 2010 +0000 @@ -2359,7 +2359,7 @@ /* Draw strike-through. */ if (s->face->strike_through_p - && !FONT_TEXTMETRIC(s->font).tmStruckOut) + && !FONT_TEXTMETRIC (s->font).tmStruckOut) { unsigned long h = 1; unsigned long dy = (s->height - h) / 2; @@ -3294,7 +3294,7 @@ BLOCK_INPUT; si.cbSize = sizeof (si); si.fMask = SIF_POS | SIF_PAGE; - GetScrollInfo(w, SB_CTL, &si); + GetScrollInfo (w, SB_CTL, &si); near_bottom_p = si.nPos + si.nPage >= range; UNBLOCK_INPUT; if (!near_bottom_p) @@ -4169,7 +4169,7 @@ temp_index = 0; temp_buffer[temp_index++] = msg.msg.wParam; inev.kind = MULTIMEDIA_KEY_EVENT; - inev.code = GET_APPCOMMAND_LPARAM(msg.msg.lParam); + inev.code = GET_APPCOMMAND_LPARAM (msg.msg.lParam); inev.modifiers = msg.dwModifiers; XSETFRAME (inev.frame_or_window, f); inev.timestamp = msg.msg.time; @@ -4217,7 +4217,7 @@ selected now and last mouse movement event was not in it. Minibuffer window will be selected only when it is active. */ - if (WINDOWP(window) + if (WINDOWP (window) && !EQ (window, last_window) && !EQ (window, selected_window) /* For click-to-focus window managers @@ -5344,8 +5344,8 @@ rect.right = pixelwidth; rect.bottom = pixelheight; - AdjustWindowRect(&rect, f->output_data.w32->dwStyle, - FRAME_EXTERNAL_MENU_BAR (f)); + AdjustWindowRect (&rect, f->output_data.w32->dwStyle, + FRAME_EXTERNAL_MENU_BAR (f)); my_set_window_pos (FRAME_W32_WINDOW (f), NULL, @@ -5587,8 +5587,8 @@ /* Adjust vertical window position in order to avoid being covered by a task bar placed at the bottom of the desktop. */ - SystemParametersInfo(SPI_GETWORKAREA, 0, &workarea_rect, 0); - GetWindowRect(FRAME_W32_WINDOW(f), &window_rect); + SystemParametersInfo (SPI_GETWORKAREA, 0, &workarea_rect, 0); + GetWindowRect (FRAME_W32_WINDOW(f), &window_rect); if (window_rect.bottom > workarea_rect.bottom && window_rect.top > workarea_rect.top) f->top_pos = max (window_rect.top @@ -6145,7 +6145,7 @@ } dpyinfo->color_list = NULL; if (dpyinfo->palette) - DeleteObject(dpyinfo->palette); + DeleteObject (dpyinfo->palette); } xfree (dpyinfo->w32_id_name);
--- a/src/w32uniscribe.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32uniscribe.c Wed Jul 07 22:09:05 2010 +0000 @@ -165,7 +165,7 @@ f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); features = otf_features (context, "GSUB"); XSETCAR (capability, features); @@ -276,7 +276,7 @@ passed in. */ f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); result = ScriptShape (context, &(uniscribe_font->cache), chars + items[i].iCharPos, nchars_in_run, @@ -311,7 +311,7 @@ /* Cache not complete... */ f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); result = ScriptPlace (context, &(uniscribe_font->cache), glyphs, nglyphs, attributes, &(items[i].a), @@ -386,7 +386,7 @@ /* Cache incomplete... */ f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); result = ScriptGetGlyphABCWidth (context, &(uniscribe_font->cache), glyphs[j], &char_metric); @@ -496,7 +496,7 @@ the frame. */ f = XFRAME (selected_frame); context = get_frame_dc (f); - old_font = SelectObject (context, FONT_HANDLE(font)); + old_font = SelectObject (context, FONT_HANDLE (font)); result = ScriptShape (context, &(uniscribe_font->cache), ch, len, 2, &(items[0].a), glyphs, clusters, attrs, &nglyphs);
--- a/src/w32xfns.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/w32xfns.c Wed Jul 07 22:09:05 2010 +0000 @@ -214,7 +214,7 @@ if (!UnionRect (&(lpmsg->rect), &(lpmsg->rect), &(lpCur->w32msg.rect))) { - SetRectEmpty(&(lpmsg->rect)); + SetRectEmpty (&(lpmsg->rect)); } myfree (lpCur);
--- a/src/window.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/window.c Wed Jul 07 22:09:05 2010 +0000 @@ -683,7 +683,7 @@ { register struct window *w = decode_any_window (window); int add_x, add_y; - calc_absolute_offset(w, &add_x, &add_y); + calc_absolute_offset (w, &add_x, &add_y); return Fcons (make_number (WINDOW_LEFT_EDGE_X (w) + add_x), Fcons (make_number (WINDOW_TOP_EDGE_Y (w) + add_y), @@ -761,7 +761,7 @@ { register struct window *w = decode_any_window (window); int add_x, add_y; - calc_absolute_offset(w, &add_x, &add_y); + calc_absolute_offset (w, &add_x, &add_y); return list4 (make_number (WINDOW_BOX_LEFT_EDGE_X (w) + WINDOW_LEFT_MARGIN_WIDTH (w) @@ -3009,7 +3009,7 @@ a specific window, it will attempt to strictly resize that window proportionally, even at the expense of deleting smaller windows. */ static int * -shrink_windows (int total, int size, int nchildren, int shrinkable, +shrink_windows (int total, int size, int nchildren, int shrinkable, int resize_fixed_p, Lisp_Object forward, int width_p, int safe_p) { int available_resize = 0;
--- a/src/xdisp.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/xdisp.c Wed Jul 07 22:09:05 2010 +0000 @@ -12933,7 +12933,7 @@ point. */ if (/* previous candidate is a glyph in TEXT_AREA of that row */ w->cursor.hpos >= 0 - && w->cursor.hpos < MATRIX_ROW_USED(matrix, w->cursor.vpos) + && w->cursor.hpos < MATRIX_ROW_USED (matrix, w->cursor.vpos) && BUFFERP (g1->object) && (g1->charpos == pt_old /* an exact match always wins */ || (BUFFERP (glyph->object) @@ -22309,7 +22309,7 @@ it->pixel_width = 0; it->nglyphs = 0; - height = get_it_property(it, Qline_height); + height = get_it_property (it, Qline_height); /* Split (line-height total-height) list */ if (CONSP (height) && CONSP (XCDR (height)) @@ -22318,7 +22318,7 @@ total_height = XCAR (XCDR (height)); height = XCAR (height); } - height = calc_line_height_property(it, height, font, boff, 1); + height = calc_line_height_property (it, height, font, boff, 1); if (it->override_ascent >= 0) { @@ -22368,11 +22368,11 @@ it->ascent = XINT (height) - it->descent; if (!NILP (total_height)) - spacing = calc_line_height_property(it, total_height, font, boff, 0); - else - { - spacing = get_it_property(it, Qline_spacing); - spacing = calc_line_height_property(it, spacing, font, boff, 0); + spacing = calc_line_height_property (it, total_height, font, boff, 0); + else + { + spacing = get_it_property (it, Qline_spacing); + spacing = calc_line_height_property (it, spacing, font, boff, 0); } if (INTEGERP (spacing)) {
--- a/src/xfaces.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/xfaces.c Wed Jul 07 22:09:05 2010 +0000 @@ -764,7 +764,7 @@ { GC gc = xmalloc (sizeof (*gc)); if (gc) - bcopy(xgcv, gc, sizeof(XGCValues)); + bcopy (xgcv, gc, sizeof (XGCValues)); return gc; }
--- a/src/xterm.c Tue Jul 06 22:53:26 2010 +0000 +++ b/src/xterm.c Wed Jul 07 22:09:05 2010 +0000 @@ -481,7 +481,7 @@ if (FRAME_X_DISPLAY_INFO (f)->root_window != FRAME_X_OUTPUT (f)->parent_desc) /* Since the WM decoration lies under the FRAME_OUTER_WINDOW, we must treat the former instead of the latter. */ - win = FRAME_X_OUTPUT(f)->parent_desc; + win = FRAME_X_OUTPUT (f)->parent_desc; if (dpyinfo->x_highlight_frame == f) alpha = f->alpha[0]; @@ -510,10 +510,10 @@ unsigned long n, left; x_catch_errors (dpy); - rc = XGetWindowProperty(dpy, win, XInternAtom(dpy, OPACITY, False), - 0L, 1L, False, XA_CARDINAL, - &actual, &format, &n, &left, - &data); + rc = XGetWindowProperty (dpy, win, XInternAtom(dpy, OPACITY, False), + 0L, 1L, False, XA_CARDINAL, + &actual, &format, &n, &left, + &data); if (rc == Success && actual != None) if (*(unsigned long *)data == opac) @@ -2259,7 +2259,7 @@ extra = s->face->id == TOOL_BAR_FACE_ID ? XINT (Vtool_bar_button_margin) : 0; - + x0 = x - thick - extra; y0 = y - thick - extra; x1 = x + s->slice.width + thick - 1 + extra; @@ -2879,7 +2879,7 @@ redisplay, do it here. */ gtk_widget_queue_draw (FRAME_GTK_WIDGET (f)); #endif - + XFlush (FRAME_X_DISPLAY (f)); UNBLOCK_INPUT; @@ -3086,7 +3086,7 @@ XTtoggle_invisible_pointer (FRAME_PTR f, int invisible) { BLOCK_INPUT; - if (invisible) + if (invisible) { if (FRAME_X_DISPLAY_INFO (f)->invisible_cursor != 0) XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), @@ -4553,7 +4553,7 @@ if (f->output_data.x->scroll_bar_top_shadow_pixel == -1) { pixel = f->output_data.x->scroll_bar_background_pixel; - if (pixel != -1) + if (pixel != -1) { if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), @@ -4565,7 +4565,7 @@ if (f->output_data.x->scroll_bar_bottom_shadow_pixel == -1) { pixel = f->output_data.x->scroll_bar_background_pixel; - if (pixel != -1) + if (pixel != -1) { if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), @@ -5729,10 +5729,10 @@ EVENT_INIT (inev.ie); inev.ie.kind = NO_EVENT; inev.ie.arg = Qnil; - + if (pending_event_wait.eventtype == event.type) pending_event_wait.eventtype = 0; /* Indicates we got it. */ - + switch (event.type) { case ClientMessage: @@ -6652,7 +6652,7 @@ event.xconfigure.height); f = 0; } -#endif +#endif if (f) { #ifndef USE_X_TOOLKIT @@ -8386,7 +8386,7 @@ set_wm_state (frame, 0, fs, NULL); set_wm_state (frame, 0, fh, NULL); set_wm_state (frame, 0, fw, NULL); - + /* If there are _NET_ atoms we assume we have extended window manager hints. */ switch (f->want_fullscreen) @@ -8459,7 +8459,7 @@ for (i = 0; i < actual_size; ++i) { Atom a = ((Atom*)tmp_data)[i]; - if (a == dpyinfo->Xatom_net_wm_state_maximized_horz) + if (a == dpyinfo->Xatom_net_wm_state_maximized_horz) { if (value == FULLSCREEN_HEIGHT) value = FULLSCREEN_MAXIMIZED; @@ -8480,7 +8480,7 @@ } lval = Qnil; - switch (value) + switch (value) { case FULLSCREEN_WIDTH: lval = Qfullwidth; @@ -8495,7 +8495,7 @@ lval = Qmaximized; break; } - + store_frame_param (f, Qfullscreen, lval); store_frame_param (f, Qsticky, sticky ? Qt : Qnil); @@ -8533,7 +8533,7 @@ case FULLSCREEN_HEIGHT: height = x_display_pixel_height (dpyinfo); } - + if (FRAME_COLS (f) != width || FRAME_LINES (f) != height) { change_frame_size (f, height, width, 0, 1, 0); @@ -8661,7 +8661,7 @@ FD_ZERO (&fds); FD_SET (fd, &fds); - + EMACS_GET_TIME (time_now); EMACS_SUB_TIME (tmo, tmo_at, time_now); @@ -8751,7 +8751,7 @@ if (NILP (tip_frame) || XFRAME (tip_frame) != f) { int r, c; - + /* When the frame is maximized/fullscreen or running under for example Xmonad, x_set_window_size_1 will be a no-op. In that case, the right thing to do is extend rows/cols to @@ -9790,7 +9790,7 @@ fprintf (stderr, "%s-WARNING **: %s\n", log_domain, message); } #endif - + /* Open a connection to X display DISPLAY_NAME, and return the structure that describes the open display. If we cannot contact the display, return null. */ @@ -10211,7 +10211,7 @@ = XInternAtom (dpyinfo->display, "_NET_WM_ICON_NAME", False); dpyinfo->Xatom_net_wm_name = XInternAtom (dpyinfo->display, "_NET_WM_NAME", False); - + dpyinfo->cut_buffers_initialized = 0; dpyinfo->x_dnd_atoms_size = 8; @@ -10340,7 +10340,7 @@ #ifdef HAVE_X_SM /* Close X session management when we close its display. */ if (t->id == 1 && x_session_have_connection ()) - x_session_close(); + x_session_close (); #endif delete_terminal (t); break;