Mercurial > hg > xemacs-beta
diff src/frame.c @ 867:804517e16990
[xemacs-hg @ 2002-06-05 09:54:39 by ben]
Textual renaming: text/char names
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization.
[a] distinguish between "charptr" when it refers to operations on
the pointer itself and when it refers to operations on text; and
[b] use consistent naming for everything referring to internal
format, i.e.
Itext == text in internal format
Ibyte == a byte in such text
Ichar == a char as represented in internal character format
thus e.g.
set_charptr_emchar -> set_itext_ichar
The pre and post tags on either side of this change are:
pre-internal-format-textual-renaming
post-internal-format-textual-renaming
See the Internals Manual for details of exactly how this was done,
how to handle the change in your workspace, etc.
| author | ben |
|---|---|
| date | Wed, 05 Jun 2002 09:58:45 +0000 |
| parents | 42375619fa45 |
| children | 79c6ff3eef26 |
line wrap: on
line diff
--- a/src/frame.c Tue Jun 04 17:40:00 2002 +0000 +++ b/src/frame.c Wed Jun 05 09:58:45 2002 +0000 @@ -125,7 +125,7 @@ static struct display_line title_string_display_line; /* Used by generate_title_string. Global because they get used so much that the dynamic allocation time adds up. */ -static Emchar_dynarr *title_string_emchar_dynarr; +static Ichar_dynarr *title_string_ichar_dynarr; static Lisp_Object @@ -234,7 +234,7 @@ buf = Fcurrent_buffer (); /* If buf is a 'hidden' buffer (i.e. one whose name starts with a space), try to find another one. */ - if (string_emchar (Fbuffer_name (buf), 0) == ' ') + if (string_ichar (Fbuffer_name (buf), 0) == ' ') buf = Fother_buffer (buf, Qnil, Qnil); Fset_window_buffer (root_window, buf, Qnil); } @@ -411,7 +411,7 @@ else name = build_string ("emacs"); - if (!NILP (Fstring_match (make_string ((const Intbyte *) "\\.", 2), name, + if (!NILP (Fstring_match (make_string ((const Ibyte *) "\\.", 2), name, Qnil, Qnil))) syntax_error (". not allowed in frame names", name); @@ -3217,7 +3217,7 @@ /* The caller is responsible for freeing the returned string. */ -static Intbyte * +static Ibyte * generate_title_string (struct window *w, Lisp_Object format_str, face_index findex, int type) { @@ -3232,19 +3232,19 @@ generate_formatted_string_db (format_str, Qnil, w, dl, db, findex, 0, -1, type); - Dynarr_reset (title_string_emchar_dynarr); + Dynarr_reset (title_string_ichar_dynarr); while (elt < Dynarr_length (db->runes)) { if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR) - Dynarr_add (title_string_emchar_dynarr, + Dynarr_add (title_string_ichar_dynarr, Dynarr_atp (db->runes, elt)->object.chr.ch); elt++; } return - convert_emchar_string_into_malloced_string - (Dynarr_atp (title_string_emchar_dynarr, 0), - Dynarr_length (title_string_emchar_dynarr), 0); + convert_ichar_string_into_malloced_string + (Dynarr_atp (title_string_ichar_dynarr, 0), + Dynarr_length (title_string_ichar_dynarr), 0); } void @@ -3253,7 +3253,7 @@ struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); Lisp_Object title_format; Lisp_Object icon_format; - Intbyte *title; + Ibyte *title; /* We don't change the title for the minibuffer unless the frame only has a minibuffer. */ @@ -3268,14 +3268,14 @@ title_format = symbol_value_in_buffer (Qframe_title_format, w->buffer); icon_format = symbol_value_in_buffer (Qframe_icon_title_format, w->buffer); - if (HAS_FRAMEMETH_P (f, set_title_from_intbyte)) + if (HAS_FRAMEMETH_P (f, set_title_from_ibyte)) { title = generate_title_string (w, title_format, DEFAULT_INDEX, CURRENT_DISP); - FRAMEMETH (f, set_title_from_intbyte, (f, title)); + FRAMEMETH (f, set_title_from_ibyte, (f, title)); } - if (HAS_FRAMEMETH_P (f, set_icon_name_from_intbyte)) + if (HAS_FRAMEMETH_P (f, set_icon_name_from_ibyte)) { if (!EQ (icon_format, title_format) || !title) { @@ -3285,7 +3285,7 @@ title = generate_title_string (w, icon_format, DEFAULT_INDEX, CURRENT_DISP); } - FRAMEMETH (f, set_icon_name_from_intbyte, (f, title)); + FRAMEMETH (f, set_icon_name_from_ibyte, (f, title)); } if (title) @@ -3355,7 +3355,7 @@ if (!initialized) #endif { - title_string_emchar_dynarr = Dynarr_new (Emchar); + title_string_ichar_dynarr = Dynarr_new (Ichar); xzero (title_string_display_line); } }