Mercurial > hg > xemacs-beta

comparison src/menubar.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 e7ee5f8bde58
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
329 (name, buffer)) 329 (name, buffer))
330 { 330 {
331 struct buffer *buf = decode_buffer (buffer, 0); 331 struct buffer *buf = decode_buffer (buffer, 0);
332 Charcount end; 332 Charcount end;
333 int i; 333 int i;
334 Intbyte *name_data; 334 Ibyte *name_data;
335 Intbyte *string_result; 335 Ibyte *string_result;
336 Intbyte *string_result_ptr; 336 Ibyte *string_result_ptr;
337 Emchar elt; 337 Ichar elt;
338 int expecting_underscore = 0; 338 int expecting_underscore = 0;
339 339
340 CHECK_STRING (name); 340 CHECK_STRING (name);
341 341
342 end = string_char_length (name); 342 end = string_char_length (name);
343 name_data = XSTRING_DATA (name); 343 name_data = XSTRING_DATA (name);
344 344
345 string_result = (Intbyte *) ALLOCA (end * MAX_EMCHAR_LEN); 345 string_result = (Ibyte *) ALLOCA (end * MAX_ICHAR_LEN);
346 string_result_ptr = string_result; 346 string_result_ptr = string_result;
347 for (i = 0; i < end; i++) 347 for (i = 0; i < end; i++)
348 { 348 {
349 elt = charptr_emchar (name_data); 349 elt = itext_ichar (name_data);
350 elt = DOWNCASE (buf, elt); 350 elt = DOWNCASE (buf, elt);
351 if (expecting_underscore) 351 if (expecting_underscore)
352 { 352 {
353 expecting_underscore = 0; 353 expecting_underscore = 0;
354 switch (elt) 354 switch (elt)
355 { 355 {
356 case '%': 356 case '%':
357 /* Allow `%%' to mean `%'. */ 357 /* Allow `%%' to mean `%'. */
358 string_result_ptr += set_charptr_emchar (string_result_ptr, '%'); 358 string_result_ptr += set_itext_ichar (string_result_ptr, '%');
359 break; 359 break;
360 case '_': 360 case '_':
361 break; 361 break;
362 default: 362 default:
363 string_result_ptr += set_charptr_emchar (string_result_ptr, '%'); 363 string_result_ptr += set_itext_ichar (string_result_ptr, '%');
364 string_result_ptr += set_charptr_emchar (string_result_ptr, elt); 364 string_result_ptr += set_itext_ichar (string_result_ptr, elt);
365 } 365 }
366 } 366 }
367 else if (elt == '%') 367 else if (elt == '%')
368 expecting_underscore = 1; 368 expecting_underscore = 1;
369 else 369 else
370 string_result_ptr += set_charptr_emchar (string_result_ptr, elt); 370 string_result_ptr += set_itext_ichar (string_result_ptr, elt);
371 INC_CHARPTR (name_data); 371 INC_IBYTEPTR (name_data);
372 } 372 }
373 373
374 if (string_result_ptr - string_result == XSTRING_LENGTH (name) 374 if (string_result_ptr - string_result == XSTRING_LENGTH (name)
375 && !memcmp (string_result, XSTRING_DATA (name), XSTRING_LENGTH (name))) 375 && !memcmp (string_result, XSTRING_DATA (name), XSTRING_LENGTH (name)))
376 return name; 376 return name;