Mercurial > hg > xemacs-beta

comparison src/minibuf.c @ 5581:56144c8593a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mechanically change INT to FIXNUM in our sources. src/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT (where it refers to non-bignum Lisp integers) to FIXNUM in our sources. Done for the following functions, enums, and macros: Lisp_Type_Int_Even, Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(), XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(), EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT. The EMACS_INT typedef was not changed, it does not describe non-bignum Lisp integers. Script that did the change available in http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . modules/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers. See the src/ChangeLog entry for more details. man/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> * internals/internals.texi (How Lisp Objects Are Represented in C): * internals/internals.texi (Integers and Characters): Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 09 Oct 2011 09:51:57 +0100
parents 308d34e9f07d
children 2014ff433daf
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
67 DEFUN ("minibuffer-depth", Fminibuffer_depth, 0, 0, 0, /* 67 DEFUN ("minibuffer-depth", Fminibuffer_depth, 0, 0, 0, /*
68 Return current depth of activations of minibuffer, a nonnegative integer. 68 Return current depth of activations of minibuffer, a nonnegative integer.
69 */ 69 */
70 ()) 70 ())
71 { 71 {
72 return make_int (minibuf_level); 72 return make_fixnum (minibuf_level);
73 } 73 }
74 74
75 /* The default buffer to use as the window-buffer of minibuffer windows */ 75 /* The default buffer to use as the window-buffer of minibuffer windows */
76 /* Note there is special code in kill-buffer to make this unkillable */ 76 /* Note there is special code in kill-buffer to make this unkillable */
77 Lisp_Object Vminibuffer_zero; 77 Lisp_Object Vminibuffer_zero;
88 XWINDOW (minibuf_window)->last_modified[CMOTION_DISP] = Qzero; 88 XWINDOW (minibuf_window)->last_modified[CMOTION_DISP] = Qzero;
89 XWINDOW (minibuf_window)->last_facechange[CURRENT_DISP] = Qzero; 89 XWINDOW (minibuf_window)->last_facechange[CURRENT_DISP] = Qzero;
90 XWINDOW (minibuf_window)->last_facechange[DESIRED_DISP] = Qzero; 90 XWINDOW (minibuf_window)->last_facechange[DESIRED_DISP] = Qzero;
91 XWINDOW (minibuf_window)->last_facechange[CMOTION_DISP] = Qzero; 91 XWINDOW (minibuf_window)->last_facechange[CMOTION_DISP] = Qzero;
92 Vminibuf_prompt = Felt (unwind_data, Qzero); 92 Vminibuf_prompt = Felt (unwind_data, Qzero);
93 minibuf_level = XINT (Felt (unwind_data, make_int (1))); 93 minibuf_level = XFIXNUM (Felt (unwind_data, make_fixnum (1)));
94 while (CONSP (unwind_data)) 94 while (CONSP (unwind_data))
95 { 95 {
96 Lisp_Object victim = unwind_data; 96 Lisp_Object victim = unwind_data;
97 unwind_data = XCDR (unwind_data); 97 unwind_data = XCDR (unwind_data);
98 free_cons (victim); 98 free_cons (victim);
149 single_console_state (); 149 single_console_state ();
150 150
151 record_unwind_protect (read_minibuffer_internal_unwind, 151 record_unwind_protect (read_minibuffer_internal_unwind,
152 noseeum_cons 152 noseeum_cons
153 (Vminibuf_prompt, 153 (Vminibuf_prompt,
154 noseeum_cons (make_int (minibuf_level), Qnil))); 154 noseeum_cons (make_fixnum (minibuf_level), Qnil)));
155 Vminibuf_prompt = LISP_GETTEXT (prompt); 155 Vminibuf_prompt = LISP_GETTEXT (prompt);
156 156
157 /* NOTE: Here (or somewhere around here), in FSFmacs 19.30, 157 /* NOTE: Here (or somewhere around here), in FSFmacs 19.30,
158 choose_minibuf_frame() is called. This is the only 158 choose_minibuf_frame() is called. This is the only
159 place in FSFmacs that it's called any more -- there's 159 place in FSFmacs that it's called any more -- there's
509 XSTRING_DATA (string), 509 XSTRING_DATA (string),
510 bestmatchsize, 0)) 510 bestmatchsize, 0))
511 return Qt; 511 return Qt;
512 512
513 /* Else extract the part in which all completions agree */ 513 /* Else extract the part in which all completions agree */
514 return Fsubseq (bestmatch, Qzero, make_int (bestmatchsize)); 514 return Fsubseq (bestmatch, Qzero, make_fixnum (bestmatchsize));
515 } 515 }
516 516
517 517
518 DEFUN ("all-completions", Fall_completions, 2, 3, 0, /* 518 DEFUN ("all-completions", Fall_completions, 2, 3, 0, /*
519 Search for partial matches to STRING in COLLECTION. 519 Search for partial matches to STRING in COLLECTION.
664 DEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width, 0, 0, 0, /* 664 DEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width, 0, 0, 0, /*
665 Return the display width of the minibuffer prompt. 665 Return the display width of the minibuffer prompt.
666 */ 666 */
667 ()) 667 ())
668 { 668 {
669 return make_int (minibuf_prompt_width); 669 return make_fixnum (minibuf_prompt_width);
670 } 670 }
671 #endif /* 0 */ 671 #endif /* 0 */
672 672
673 673
674 /************************************************************************/ 674 /************************************************************************/