Mercurial > hg > xemacs-beta
annotate src/abbrev.c @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -0600 |
| parents | 69c43a181729 |
| children | e813cf16c015 |
| rev | line source |
|---|---|
| 428 | 1 /* Primitives for word-abbrev mode. |
| 2 Copyright (C) 1985, 1986, 1992, 1993 Free Software Foundation, Inc. | |
| 793 | 3 Copyright (C) 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: FSF 19.30. Note that there are many more functions in | |
| 23 FSF's abbrev.c. These have been moved into Lisp in XEmacs. */ | |
| 24 | |
| 25 /* Authorship: | |
| 26 | |
| 27 FSF: Original version; a long time ago. | |
| 28 JWZ or Mly: Mostly moved into Lisp; maybe 1992. | |
| 29 Ben Wing: Some changes for Mule for 19.12. | |
| 30 Hrvoje Niksic: Largely rewritten in June 1997. | |
| 31 */ | |
| 32 | |
| 33 /* This file has been Mule-ized. */ | |
| 34 | |
| 35 #include <config.h> | |
| 36 #include "lisp.h" | |
| 37 | |
| 38 #include "buffer.h" | |
| 39 #include "commands.h" | |
| 40 #include "insdel.h" | |
| 41 #include "syntax.h" | |
| 42 #include "window.h" | |
| 43 | |
| 44 /* An abbrev table is an obarray. | |
| 45 Each defined abbrev is represented by a symbol in that obarray | |
| 46 whose print name is the abbreviation. | |
| 47 The symbol's value is a string which is the expansion. | |
| 48 If its function definition is non-nil, it is called | |
| 49 after the expansion is done. | |
| 50 The plist slot of the abbrev symbol is its usage count. */ | |
| 51 | |
| 52 /* The table of global abbrevs. These are in effect | |
| 53 in any buffer in which abbrev mode is turned on. */ | |
| 54 Lisp_Object Vglobal_abbrev_table; | |
| 55 | |
| 56 int abbrev_all_caps; | |
| 57 | |
| 58 /* Non-nil => use this location as the start of abbrev to expand | |
| 59 (rather than taking the word before point as the abbrev) */ | |
| 60 Lisp_Object Vabbrev_start_location; | |
| 61 | |
| 62 /* Buffer that Vabbrev_start_location applies to */ | |
| 63 Lisp_Object Vabbrev_start_location_buffer; | |
| 64 | |
| 65 /* The symbol representing the abbrev most recently expanded */ | |
| 66 Lisp_Object Vlast_abbrev; | |
| 67 | |
| 68 /* A string for the actual text of the abbrev most recently expanded. | |
| 69 This has more info than Vlast_abbrev since case is significant. */ | |
| 70 Lisp_Object Vlast_abbrev_text; | |
| 71 | |
| 72 /* Character address of start of last abbrev expanded */ | |
| 458 | 73 Fixnum last_abbrev_location; |
| 428 | 74 |
| 75 /* Hook to run before expanding any abbrev. */ | |
| 76 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook; | |
| 77 | |
| 3965 | 78 Lisp_Object Qsystem_type, Qcount; |
| 428 | 79 |
| 826 | 80 struct abbrev_match_mapper_closure |
| 81 { | |
| 428 | 82 struct buffer *buf; |
| 826 | 83 Lisp_Object chartab; |
| 814 | 84 Charbpos point; |
| 85 Charcount maxlen; | |
| 440 | 86 Lisp_Symbol *found; |
| 428 | 87 }; |
| 88 | |
| 89 /* For use by abbrev_match(): Match SYMBOL's name against buffer text | |
| 90 before point, case-insensitively. When found, return non-zero, so | |
| 91 that map_obarray terminates mapping. */ | |
| 92 static int | |
| 93 abbrev_match_mapper (Lisp_Object symbol, void *arg) | |
| 94 { | |
| 95 struct abbrev_match_mapper_closure *closure = | |
| 96 (struct abbrev_match_mapper_closure *)arg; | |
| 97 Charcount abbrev_length; | |
| 440 | 98 Lisp_Symbol *sym = XSYMBOL (symbol); |
| 793 | 99 Lisp_Object abbrev; |
| 428 | 100 |
| 101 /* symbol_value should be OK here, because abbrevs are not expected | |
| 102 to contain any SYMBOL_MAGIC stuff. */ | |
| 103 if (UNBOUNDP (symbol_value (sym)) || NILP (symbol_value (sym))) | |
| 104 { | |
| 105 /* The symbol value of nil means that abbrev got undefined. */ | |
| 106 return 0; | |
| 107 } | |
| 108 abbrev = symbol_name (sym); | |
| 826 | 109 abbrev_length = string_char_length (abbrev); |
| 428 | 110 if (abbrev_length > closure->maxlen) |
| 111 { | |
| 112 /* This abbrev is too large -- it wouldn't fit. */ | |
| 113 return 0; | |
| 114 } | |
| 115 /* If `bar' is an abbrev, and a user presses `fubar<SPC>', we don't | |
| 116 normally want to expand it. OTOH, if the abbrev begins with | |
| 117 non-word syntax (e.g. `#if'), it is OK to abbreviate it anywhere. */ | |
| 118 if (abbrev_length < closure->maxlen && abbrev_length > 0 | |
| 867 | 119 && (WORD_SYNTAX_P (closure->chartab, string_ichar (abbrev, 0))) |
| 428 | 120 && (WORD_SYNTAX_P (closure->chartab, |
| 121 BUF_FETCH_CHAR (closure->buf, | |
| 793 | 122 closure->point - |
| 123 (abbrev_length + 1))))) | |
| 428 | 124 { |
| 125 return 0; | |
| 126 } | |
| 127 /* Match abbreviation string against buffer text. */ | |
| 128 { | |
| 867 | 129 Ibyte *ptr = XSTRING_DATA (abbrev); |
| 428 | 130 Charcount idx; |
| 131 | |
| 132 for (idx = 0; idx < abbrev_length; idx++) | |
| 133 { | |
| 134 if (DOWNCASE (closure->buf, | |
| 135 BUF_FETCH_CHAR (closure->buf, | |
| 136 closure->point - abbrev_length + idx)) | |
| 867 | 137 != DOWNCASE (closure->buf, itext_ichar (ptr))) |
| 428 | 138 { |
| 139 break; | |
| 140 } | |
| 867 | 141 INC_IBYTEPTR (ptr); |
| 428 | 142 } |
| 143 if (idx == abbrev_length) | |
| 144 { | |
| 145 /* This is the one. */ | |
| 146 closure->found = sym; | |
| 147 return 1; | |
| 148 } | |
| 149 } | |
| 150 return 0; | |
| 151 } | |
| 152 | |
| 153 /* Match the buffer text against names of symbols in obarray. Returns | |
| 154 the matching symbol, or 0 if not found. */ | |
| 440 | 155 static Lisp_Symbol * |
| 428 | 156 abbrev_match (struct buffer *buf, Lisp_Object obarray) |
| 157 { | |
| 158 struct abbrev_match_mapper_closure closure; | |
| 159 | |
| 160 /* Precalculate some stuff, so mapper function needn't to it in each | |
| 161 iteration. */ | |
| 162 closure.buf = buf; | |
| 163 closure.point = BUF_PT (buf); | |
| 164 closure.maxlen = closure.point - BUF_BEGV (buf); | |
| 826 | 165 closure.chartab = buf->mirror_syntax_table; |
| 428 | 166 closure.found = 0; |
| 167 | |
| 168 map_obarray (obarray, abbrev_match_mapper, &closure); | |
| 169 | |
| 170 return closure.found; | |
| 171 } | |
| 172 | |
| 173 /* Take the word before point (or Vabbrev_start_location, if non-nil), | |
| 174 and look it up in OBARRAY, and return the symbol (or zero). This | |
| 175 used to be the default method of searching, with the obvious | |
| 176 limitation that the abbrevs may consist only of word characters. | |
| 177 It is an order of magnitude faster than the proper abbrev_match(), | |
| 178 but then again, vi is an order of magnitude faster than Emacs. | |
| 179 | |
| 180 This speed difference should be unnoticeable, though. I have tested | |
| 181 the degenerated cases of thousands of abbrevs being defined, and | |
| 182 abbrev_match() was still fast enough for normal operation. */ | |
| 440 | 183 static Lisp_Symbol * |
| 428 | 184 abbrev_oblookup (struct buffer *buf, Lisp_Object obarray) |
| 185 { | |
| 665 | 186 Charbpos wordstart, wordend; |
| 867 | 187 Ibyte *word, *p; |
| 814 | 188 Charbpos idx; |
| 428 | 189 Lisp_Object lookup; |
| 190 | |
| 191 CHECK_VECTOR (obarray); | |
| 192 | |
| 193 if (!NILP (Vabbrev_start_location)) | |
| 194 { | |
| 195 wordstart = get_buffer_pos_char (buf, Vabbrev_start_location, | |
| 196 GB_COERCE_RANGE); | |
| 197 Vabbrev_start_location = Qnil; | |
| 198 #if 0 | |
| 199 /* Previously, abbrev-prefix-mark crockishly inserted a dash to | |
| 200 indicate the abbrev start point. It now uses an extent with | |
| 201 a begin glyph so there's no dash to remove. */ | |
| 202 if (wordstart != BUF_ZV (buf) | |
| 203 && BUF_FETCH_CHAR (buf, wordstart) == '-') | |
| 204 { | |
| 205 buffer_delete_range (buf, wordstart, wordstart + 1, 0); | |
| 206 } | |
| 207 #endif | |
| 208 wordend = BUF_PT (buf); | |
| 209 } | |
| 210 else | |
| 211 { | |
| 665 | 212 Charbpos point = BUF_PT (buf); |
| 428 | 213 |
| 214 wordstart = scan_words (buf, point, -1); | |
| 215 if (!wordstart) | |
| 216 return 0; | |
| 217 | |
| 218 wordend = scan_words (buf, wordstart, 1); | |
| 219 if (!wordend) | |
| 220 return 0; | |
| 221 if (wordend > BUF_ZV (buf)) | |
| 222 wordend = BUF_ZV (buf); | |
| 223 if (wordend > point) | |
| 224 wordend = point; | |
| 225 /* Unlike the original function, we allow expansion only after | |
| 226 the abbrev, not preceded by a number of spaces. This is | |
| 227 because of consistency with abbrev_match. */ | |
| 228 if (wordend < point) | |
| 229 return 0; | |
| 230 } | |
| 231 | |
| 232 if (wordend <= wordstart) | |
| 233 return 0; | |
| 234 | |
| 2367 | 235 p = word = alloca_ibytes (MAX_ICHAR_LEN * (wordend - wordstart)); |
| 428 | 236 for (idx = wordstart; idx < wordend; idx++) |
| 237 { | |
| 867 | 238 Ichar c = BUF_FETCH_CHAR (buf, idx); |
| 428 | 239 if (UPPERCASEP (buf, c)) |
| 240 c = DOWNCASE (buf, c); | |
| 867 | 241 p += set_itext_ichar (p, c); |
| 428 | 242 } |
| 243 lookup = oblookup (obarray, word, p - word); | |
| 244 if (SYMBOLP (lookup) && !NILP (symbol_value (XSYMBOL (lookup)))) | |
| 245 return XSYMBOL (lookup); | |
| 246 else | |
| 247 return NULL; | |
| 248 } | |
| 249 | |
| 250 /* Return non-zero if OBARRAY contains an interned symbol ` '. */ | |
| 251 static int | |
| 252 obarray_has_blank_p (Lisp_Object obarray) | |
| 253 { | |
| 867 | 254 return !ZEROP (oblookup (obarray, (Ibyte *)" ", 1)); |
| 428 | 255 } |
| 256 | |
| 257 /* Analyze case in the buffer substring, and report it. */ | |
| 258 static void | |
| 665 | 259 abbrev_count_case (struct buffer *buf, Charbpos pos, Charcount length, |
| 428 | 260 int *lccount, int *uccount) |
| 261 { | |
| 262 *lccount = *uccount = 0; | |
| 263 while (length--) | |
| 264 { | |
| 867 | 265 Ichar c = BUF_FETCH_CHAR (buf, pos); |
| 428 | 266 if (UPPERCASEP (buf, c)) |
| 267 ++*uccount; | |
| 268 else if (LOWERCASEP (buf, c)) | |
| 269 ++*lccount; | |
| 270 ++pos; | |
| 271 } | |
| 272 } | |
| 273 | |
| 274 DEFUN ("expand-abbrev", Fexpand_abbrev, 0, 0, "", /* | |
| 275 Expand the abbrev before point, if any. | |
| 276 Effective when explicitly called even when `abbrev-mode' is nil. | |
| 277 Returns the abbrev symbol, if expansion took place. | |
| 278 If no abbrev matched, but `pre-abbrev-expand-hook' changed the buffer, | |
| 279 returns t. | |
| 280 */ | |
| 281 ()) | |
| 282 { | |
| 283 /* This function can GC */ | |
| 284 struct buffer *buf = current_buffer; | |
| 285 int oldmodiff = BUF_MODIFF (buf); | |
| 286 Lisp_Object pre_modiff_p; | |
| 665 | 287 Charbpos point; /* position of point */ |
| 288 Charbpos abbrev_start; /* position of abbreviation beginning */ | |
| 428 | 289 |
| 440 | 290 Lisp_Symbol *(*fun) (struct buffer *, Lisp_Object); |
| 428 | 291 |
| 440 | 292 Lisp_Symbol *abbrev_symbol; |
| 428 | 293 Lisp_Object expansion, count, hook; |
| 294 Charcount abbrev_length; | |
| 295 int lccount, uccount; | |
| 296 | |
| 297 run_hook (Qpre_abbrev_expand_hook); | |
| 298 /* If the hook changes the buffer, treat that as having "done an | |
| 299 expansion". */ | |
| 300 pre_modiff_p = (BUF_MODIFF (buf) != oldmodiff ? Qt : Qnil); | |
| 301 | |
| 302 abbrev_symbol = NULL; | |
| 303 if (!BUFFERP (Vabbrev_start_location_buffer) || | |
| 304 XBUFFER (Vabbrev_start_location_buffer) != buf) | |
| 305 Vabbrev_start_location = Qnil; | |
| 306 /* We use the more general abbrev_match() if the obarray blank flag | |
| 307 is not set, and Vabbrev_start_location is nil. Otherwise, use | |
| 308 abbrev_oblookup(). */ | |
| 309 #define MATCHFUN(tbl) ((obarray_has_blank_p (tbl) \ | |
| 310 && NILP (Vabbrev_start_location)) \ | |
| 311 ? abbrev_match : abbrev_oblookup) | |
| 312 if (!NILP (buf->abbrev_table)) | |
| 313 { | |
| 314 fun = MATCHFUN (buf->abbrev_table); | |
| 315 abbrev_symbol = fun (buf, buf->abbrev_table); | |
| 316 } | |
| 317 if (!abbrev_symbol && !NILP (Vglobal_abbrev_table)) | |
| 318 { | |
| 319 fun = MATCHFUN (Vglobal_abbrev_table); | |
| 320 abbrev_symbol = fun (buf, Vglobal_abbrev_table); | |
| 321 } | |
| 322 if (!abbrev_symbol) | |
| 323 return pre_modiff_p; | |
| 324 | |
| 325 /* NOTE: we hope that `pre-abbrev-expand-hook' didn't do something | |
| 326 nasty, such as changed the buffer. Here we protect against the | |
| 327 buffer getting killed. */ | |
| 328 if (! BUFFER_LIVE_P (buf)) | |
| 329 return Qnil; | |
| 330 point = BUF_PT (buf); | |
| 331 | |
| 332 /* OK, we're out of the must-be-fast part. An abbreviation matched. | |
| 333 Now find the parameters, insert the expansion, and make it all | |
| 334 look pretty. */ | |
| 826 | 335 abbrev_length = string_char_length (symbol_name (abbrev_symbol)); |
| 428 | 336 abbrev_start = point - abbrev_length; |
| 337 | |
| 338 expansion = symbol_value (abbrev_symbol); | |
| 339 CHECK_STRING (expansion); | |
| 340 | |
| 341 count = symbol_plist (abbrev_symbol); /* Gag */ | |
| 342 if (NILP (count)) | |
| 343 count = Qzero; | |
| 344 else | |
| 345 CHECK_NATNUM (count); | |
| 346 symbol_plist (abbrev_symbol) = make_int (1 + XINT (count)); | |
| 347 | |
| 348 /* Count the case in the original text. */ | |
| 349 abbrev_count_case (buf, abbrev_start, abbrev_length, &lccount, &uccount); | |
| 350 | |
| 351 /* Remember the last abbrev text, location, etc. */ | |
| 793 | 352 Vlast_abbrev = wrap_symbol (abbrev_symbol); |
| 428 | 353 Vlast_abbrev_text = |
| 354 make_string_from_buffer (buf, abbrev_start, abbrev_length); | |
| 355 last_abbrev_location = abbrev_start; | |
| 356 | |
| 357 /* Add an undo boundary, in case we are doing this for a | |
| 358 self-inserting command which has avoided making one so far. */ | |
| 359 if (INTERACTIVE) | |
| 360 Fundo_boundary (); | |
| 361 | |
| 362 /* Remove the abbrev */ | |
| 363 buffer_delete_range (buf, abbrev_start, point, 0); | |
| 364 /* And insert the expansion. */ | |
| 365 buffer_insert_lisp_string (buf, expansion); | |
| 366 point = BUF_PT (buf); | |
| 367 | |
| 368 /* Now fiddle with the case. */ | |
| 369 if (uccount && !lccount) | |
| 370 { | |
| 371 /* Abbrev was all caps */ | |
| 372 if (!abbrev_all_caps | |
| 373 && scan_words (buf, point, -1) > scan_words (buf, abbrev_start, 1)) | |
| 374 { | |
| 375 Fupcase_initials_region (make_int (abbrev_start), make_int (point), | |
| 771 | 376 wrap_buffer (buf)); |
| 428 | 377 } |
| 378 else | |
| 379 { | |
| 380 /* If expansion is one word, or if user says so, upcase it all. */ | |
| 381 Fupcase_region (make_int (abbrev_start), make_int (point), | |
| 771 | 382 wrap_buffer (buf)); |
| 428 | 383 } |
| 384 } | |
| 385 else if (uccount) | |
| 386 { | |
| 387 /* Abbrev included some caps. Cap first initial of expansion */ | |
| 665 | 388 Charbpos pos = abbrev_start; |
| 428 | 389 /* Find the initial. */ |
| 390 while (pos < point | |
| 826 | 391 && !WORD_SYNTAX_P (buf->mirror_syntax_table, |
| 428 | 392 BUF_FETCH_CHAR (buf, pos))) |
| 393 pos++; | |
| 394 /* Change just that. */ | |
| 395 Fupcase_initials_region (make_int (pos), make_int (pos + 1), | |
| 771 | 396 wrap_buffer (buf)); |
| 428 | 397 } |
| 398 | |
| 399 hook = symbol_function (abbrev_symbol); | |
| 400 if (!NILP (hook) && !UNBOUNDP (hook)) | |
| 401 call0 (hook); | |
| 402 | |
| 403 return Vlast_abbrev; | |
| 404 } | |
| 405 | |
| 3965 | 406 static void |
| 407 write_abbrev (Lisp_Object sym, Lisp_Object stream) | |
| 408 { | |
| 409 Lisp_Object name, count, system_flag; | |
| 410 /* This function can GC */ | |
| 411 struct buffer *buf = current_buffer; | |
| 412 | |
| 413 if (INTP (XSYMBOL (sym)->plist)) | |
| 414 { | |
| 415 count = XSYMBOL (sym)->plist; | |
| 416 system_flag = Qnil; | |
| 417 } | |
| 418 else | |
| 419 { | |
| 420 count = Fget (sym, Qcount, Qunbound); | |
| 421 system_flag = Fget (sym, Qsystem_type, Qunbound); | |
| 422 } | |
| 423 | |
| 424 if (NILP (XSYMBOL_VALUE (sym)) || ! NILP (system_flag)) | |
| 425 return; | |
| 426 | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
427 buffer_insert_ascstring (buf, " ("); |
| 3965 | 428 name = Fsymbol_name (sym); |
| 429 Fprin1 (name, stream); | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
430 buffer_insert_ascstring (buf, " "); |
| 3965 | 431 Fprin1 (XSYMBOL_VALUE (sym), stream); |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
432 buffer_insert_ascstring (buf, " "); |
| 3965 | 433 Fprin1 (XSYMBOL (sym)->function, stream); |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
434 buffer_insert_ascstring (buf, " "); |
| 3965 | 435 Fprin1 (count, stream); |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
436 buffer_insert_ascstring (buf, ")\n"); |
| 3965 | 437 } |
| 438 | |
| 439 static void | |
| 440 describe_abbrev (Lisp_Object sym, Lisp_Object stream) | |
| 441 { | |
| 442 Lisp_Object one, count, system_flag; | |
| 443 /* This function can GC */ | |
| 444 struct buffer *buf = current_buffer; | |
| 445 | |
| 446 if (INTP (XSYMBOL (sym)->plist)) | |
| 447 { | |
| 448 count = XSYMBOL (sym)->plist; | |
| 449 system_flag = Qnil; | |
| 450 } | |
| 451 else | |
| 452 { | |
| 453 count = Fget (sym, Qcount, Qunbound); | |
| 454 system_flag = Fget (sym, Qsystem_type, Qunbound); | |
| 455 } | |
| 456 | |
| 457 if (NILP (XSYMBOL_VALUE (sym))) | |
| 458 return; | |
| 459 | |
| 460 one = make_int (1); | |
| 461 Fprin1 (Fsymbol_name (sym), stream); | |
| 462 | |
| 463 if (!NILP (system_flag)) | |
| 464 { | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
465 buffer_insert_ascstring (buf, " (sys)"); |
| 3965 | 466 Findent_to (make_int (20), one, Qnil); |
| 467 } | |
| 468 else | |
| 469 Findent_to (make_int (15), one, Qnil); | |
| 470 | |
| 471 Fprin1 (count, stream); | |
| 472 Findent_to (make_int (20), one, Qnil); | |
| 473 Fprin1 (XSYMBOL_VALUE (sym), stream); | |
| 474 if (!NILP (XSYMBOL (sym)->function)) | |
| 475 { | |
| 476 Findent_to (make_int (45), one, Qnil); | |
| 477 Fprin1 (XSYMBOL (sym)->function, stream); | |
| 478 } | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
479 buffer_insert_ascstring (buf, "\n"); |
| 3965 | 480 } |
| 481 | |
| 482 static int | |
| 483 record_symbol (Lisp_Object sym, void *arg) | |
| 484 { | |
| 485 Lisp_Object closure = * (Lisp_Object *) arg; | |
| 486 XSETCDR (closure, Fcons (sym, XCDR (closure))); | |
| 487 return 0; /* Never stop */ | |
| 488 } | |
| 489 | |
| 490 DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description, | |
| 491 1, 2, 0, /* | |
| 492 Insert before point a full description of abbrev table named NAME. | |
| 493 NAME is a symbol whose value is an abbrev table. | |
| 494 If optional 2nd arg READABLE is non-nil, a human-readable description | |
| 495 is inserted. Otherwise the description is an expression, | |
| 496 a call to `define-abbrev-table', which would | |
| 497 define the abbrev table NAME exactly as it is currently defined. | |
| 498 | |
| 499 Abbrevs marked as "system abbrevs" are normally omitted. However, if | |
| 500 READABLE is non-nil, they are listed. */ | |
| 501 (name, readable)) | |
| 502 { | |
| 503 Lisp_Object table; | |
| 504 Lisp_Object symbols; | |
| 505 Lisp_Object stream; | |
| 506 /* This function can GC */ | |
| 507 struct buffer *buf = current_buffer; | |
| 508 | |
| 509 CHECK_SYMBOL (name); | |
| 510 table = Fsymbol_value (name); | |
| 511 CHECK_VECTOR (table); | |
| 512 | |
| 513 /* FIXME: what's the XEmacs equivalent? APA */ | |
| 514 /* XSETBUFFER (stream, current_buffer); */ | |
| 515 /* Does not seem to work: */ | |
| 516 /* Fset_buffer (stream); */ | |
| 517 stream = wrap_buffer (current_buffer); | |
| 518 | |
| 519 symbols = Fcons (Qnil, Qnil); | |
| 520 /* Lisp_Object closure = Fcons (Qnil, Qnil); */ | |
| 521 /* struct gcpro gcpro1; */ | |
| 522 /* GCPRO1 (closure); */ | |
| 523 /* map_obarray (table, record_symbol, symbols); */ | |
| 524 map_obarray (table, record_symbol, &symbols); | |
| 525 /* map_obarray (table, record_symbol, &closure); */ | |
| 526 symbols = XCDR (symbols); | |
| 527 symbols = Fsort (symbols, Qstring_lessp); | |
| 528 | |
| 529 if (!NILP (readable)) | |
| 530 { | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
531 buffer_insert_ascstring (buf, "("); |
| 3965 | 532 Fprin1 (name, stream); |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
533 buffer_insert_ascstring (buf, ")\n\n"); |
| 3965 | 534 while (! NILP (symbols)) |
| 535 { | |
| 536 describe_abbrev (XCAR (symbols), stream); | |
| 537 symbols = XCDR (symbols); | |
| 538 } | |
| 539 | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
540 buffer_insert_ascstring (buf, "\n\n"); |
| 3965 | 541 } |
| 542 else | |
| 543 { | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
544 buffer_insert_ascstring (buf, "(define-abbrev-table '"); |
| 3965 | 545 Fprin1 (name, stream); |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
546 buffer_insert_ascstring (buf, " '(\n"); |
| 3965 | 547 while (! NILP (symbols)) |
| 548 { | |
| 549 write_abbrev (XCAR (symbols), stream); | |
| 550 symbols = XCDR (symbols); | |
| 551 } | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3965
diff
changeset
|
552 buffer_insert_ascstring (buf, " ))\n\n"); |
| 3965 | 553 } |
| 554 | |
| 555 return Qnil; | |
| 556 } | |
| 428 | 557 |
| 558 void | |
| 559 syms_of_abbrev (void) | |
| 560 { | |
| 3965 | 561 DEFSYMBOL(Qcount); |
| 562 Qcount = intern ("count"); | |
| 563 staticpro (&Qcount); | |
| 564 DEFSYMBOL(Qsystem_type); | |
| 565 Qsystem_type = intern ("system-type"); | |
| 563 | 566 DEFSYMBOL (Qpre_abbrev_expand_hook); |
| 428 | 567 DEFSUBR (Fexpand_abbrev); |
| 3965 | 568 DEFSUBR (Finsert_abbrev_table_description); |
| 428 | 569 } |
| 570 | |
| 571 void | |
| 572 vars_of_abbrev (void) | |
| 573 { | |
| 574 DEFVAR_LISP ("global-abbrev-table", &Vglobal_abbrev_table /* | |
| 575 The abbrev table whose abbrevs affect all buffers. | |
| 576 Each buffer may also have a local abbrev table. | |
| 577 If it does, the local table overrides the global one | |
| 578 for any particular abbrev defined in both. | |
| 579 */ ); | |
| 580 Vglobal_abbrev_table = Qnil; /* setup by Lisp code */ | |
| 581 | |
| 582 DEFVAR_LISP ("last-abbrev", &Vlast_abbrev /* | |
| 583 The abbrev-symbol of the last abbrev expanded. | |
| 584 See the function `abbrev-symbol'. | |
| 585 */ ); | |
| 586 | |
| 587 DEFVAR_LISP ("last-abbrev-text", &Vlast_abbrev_text /* | |
| 588 The exact text of the last abbrev expanded. | |
| 589 nil if the abbrev has already been unexpanded. | |
| 590 */ ); | |
| 591 | |
| 592 DEFVAR_INT ("last-abbrev-location", &last_abbrev_location /* | |
| 593 The location of the start of the last abbrev expanded. | |
| 594 */ ); | |
| 595 | |
| 596 Vlast_abbrev = Qnil; | |
| 597 Vlast_abbrev_text = Qnil; | |
| 598 last_abbrev_location = 0; | |
| 599 | |
| 600 DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location /* | |
| 601 Buffer position for `expand-abbrev' to use as the start of the abbrev. | |
| 602 nil means use the word before point as the abbrev. | |
| 603 Calling `expand-abbrev' sets this to nil. | |
| 604 */ ); | |
| 605 Vabbrev_start_location = Qnil; | |
| 606 | |
| 607 DEFVAR_LISP ("abbrev-start-location-buffer", &Vabbrev_start_location_buffer /* | |
| 608 Buffer that `abbrev-start-location' has been set for. | |
| 609 Trying to expand an abbrev in any other buffer clears `abbrev-start-location'. | |
| 610 */ ); | |
| 611 Vabbrev_start_location_buffer = Qnil; | |
| 612 | |
| 613 DEFVAR_BOOL ("abbrev-all-caps", &abbrev_all_caps /* | |
| 614 *Non-nil means expand multi-word abbrevs all caps if abbrev was so. | |
| 615 */ ); | |
| 616 abbrev_all_caps = 0; | |
| 617 | |
| 618 DEFVAR_LISP ("pre-abbrev-expand-hook", &Vpre_abbrev_expand_hook /* | |
| 619 Function or functions to be called before abbrev expansion is done. | |
| 620 This is the first thing that `expand-abbrev' does, and so this may change | |
| 621 the current abbrev table before abbrev lookup happens. | |
| 622 */ ); | |
| 623 Vpre_abbrev_expand_hook = Qnil; | |
| 624 } |