Mercurial > hg > xemacs-beta
annotate lisp/text-mode.el @ 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 | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; text-mode.el --- text mode, and its idiosyncratic commands. |
| 2 | |
| 3 ;; Copyright (C) 1985, 1992, 1994, 1997 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Maintainer: FSF | |
| 6 ;; Keywords: wp, dumped | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
| 10 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 11 ;; under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 ;; General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 23 ;; 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: FSF 20.2. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;; This file is dumped with XEmacs. | |
| 30 | |
| 31 ;; This package provides the fundamental text mode documented in the | |
| 32 ;; Emacs user's manual. | |
| 33 | |
| 34 ;;; Code: | |
| 35 | |
| 36 (defvar text-mode-hook nil | |
| 37 "Normal hook run when entering Text mode and many related modes.") | |
| 38 | |
| 39 (defvar text-mode-variant nil | |
| 40 "Non-nil if this buffer's major mode is a variant of Text mode.") | |
| 41 | |
| 42 (defvar text-mode-syntax-table nil | |
| 43 "Syntax table used while in text mode.") | |
| 44 | |
| 45 (defvar text-mode-abbrev-table nil | |
| 46 "Abbrev table used while in text mode.") | |
| 47 (define-abbrev-table 'text-mode-abbrev-table ()) | |
| 48 | |
| 49 (if text-mode-syntax-table | |
| 50 () | |
| 51 (setq text-mode-syntax-table (make-syntax-table)) | |
| 52 (modify-syntax-entry ?\" ". " text-mode-syntax-table) | |
| 53 (modify-syntax-entry ?\\ ". " text-mode-syntax-table) | |
| 54 (modify-syntax-entry ?' "w " text-mode-syntax-table)) | |
| 55 | |
| 56 (defvar text-mode-map nil | |
| 57 "Keymap for Text mode. | |
| 58 Many other modes, such as Mail mode, Outline mode and Indented Text mode, | |
| 59 inherit all the commands defined in this map.") | |
| 60 | |
| 61 (if text-mode-map | |
| 62 () | |
| 63 (setq text-mode-map (make-sparse-keymap)) | |
| 64 ;; XEmacs change | |
| 65 (set-keymap-name text-mode-map 'text-mode-map) | |
| 66 (define-key text-mode-map "\e\t" 'ispell-complete-word) | |
| 67 (define-key text-mode-map "\t" 'indent-relative) | |
| 68 (define-key text-mode-map "\es" 'center-line) | |
| 69 (define-key text-mode-map "\eS" 'center-paragraph)) | |
| 70 | |
| 71 | |
| 72 (defun text-mode () | |
| 73 "Major mode for editing text written for humans to read. | |
| 74 In this mode, paragraphs are delimited only by blank or white lines. | |
| 75 You can thus get the full benefit of adaptive filling | |
| 76 (see the variable `adaptive-fill-mode'). | |
| 77 \\{text-mode-map} | |
| 78 Turning on Text mode runs the normal hook `text-mode-hook'." | |
| 79 (interactive) | |
| 80 (kill-all-local-variables) | |
| 81 (use-local-map text-mode-map) | |
| 82 (setq local-abbrev-table text-mode-abbrev-table) | |
| 83 (set-syntax-table text-mode-syntax-table) | |
| 84 (make-local-variable 'paragraph-start) | |
| 85 (setq paragraph-start (concat page-delimiter "\\|[ \t]*$")) | |
| 86 (make-local-variable 'paragraph-separate) | |
| 87 (setq paragraph-separate paragraph-start) | |
| 88 (setq mode-name "Text") | |
| 89 (setq major-mode 'text-mode) | |
| 90 (run-hooks 'text-mode-hook)) | |
| 91 | |
| 92 (defun paragraph-indent-text-mode () | |
| 93 "Major mode for editing text, with leading spaces starting a paragraph. | |
| 94 In this mode, you do not need blank lines between paragraphs | |
| 95 when the first line of the following paragraph starts with whitespace. | |
| 96 Special commands: | |
| 97 \\{text-mode-map} | |
| 98 Turning on Paragraph-Indent Text mode runs the normal hooks | |
| 99 `text-mode-hook' and `paragraph-indent-text-mode-hook'." | |
| 100 (interactive) | |
| 101 (kill-all-local-variables) | |
| 102 (use-local-map text-mode-map) | |
| 103 (setq mode-name "Parindent") | |
| 104 (setq major-mode 'paragraph-indent-text-mode) | |
| 105 (setq local-abbrev-table text-mode-abbrev-table) | |
| 106 (set-syntax-table text-mode-syntax-table) | |
| 107 (run-hooks 'text-mode-hook 'paragraph-indent-text-mode-hook)) | |
| 108 | |
| 109 (defalias 'indented-text-mode 'text-mode) | |
| 110 | |
| 111 (defun text-mode-hook-identify () | |
| 112 "Mark that this mode has run `text-mode-hook'. | |
| 113 This is how `toggle-text-mode-auto-fill' knows which buffers to operate on." | |
| 114 (make-local-variable 'text-mode-variant) | |
| 115 (setq text-mode-variant t)) | |
| 116 | |
| 117 (add-hook 'text-mode-hook 'text-mode-hook-identify) | |
| 118 | |
| 119 (defun toggle-text-mode-auto-fill () | |
| 120 "Toggle whether to use Auto Fill in Text mode and related modes. | |
| 121 This command affects all buffers that use modes related to Text mode, | |
| 122 both existing buffers and buffers that you subsequently create." | |
| 123 (interactive) | |
| 124 (let ((enable-mode (not (memq 'turn-on-auto-fill text-mode-hook))) | |
| 125 (buffers (buffer-list))) | |
| 126 (if enable-mode | |
| 127 (add-hook 'text-mode-hook 'turn-on-auto-fill) | |
| 128 (remove-hook 'text-mode-hook 'turn-on-auto-fill)) | |
| 129 (while buffers | |
| 130 (with-current-buffer (car buffers) | |
| 131 (if text-mode-variant | |
| 132 (auto-fill-mode (if enable-mode 1 0)))) | |
| 133 (setq buffers (cdr buffers))) | |
| 134 (message "Auto Fill %s in Text modes" | |
| 135 (if enable-mode "enabled" "disabled")))) | |
| 136 | |
| 137 (defun center-paragraph () | |
| 138 "Center each nonblank line in the paragraph at or after point. | |
| 139 See `center-line' for more info." | |
| 140 (interactive) | |
| 141 (save-excursion | |
| 142 (forward-paragraph) | |
| 143 (or (bolp) (newline 1)) | |
| 144 (let ((end (point))) | |
| 145 (backward-paragraph) | |
| 146 (center-region (point) end)))) | |
| 147 | |
| 148 (defun center-region (from to) | |
| 149 "Center each nonblank line starting in the region. | |
| 150 See `center-line' for more info." | |
| 151 (interactive "r") | |
| 152 (if (> from to) | |
| 153 (let ((tem to)) | |
| 154 (setq to from from tem))) | |
| 155 (save-excursion | |
| 156 (save-restriction | |
| 157 (narrow-to-region from to) | |
| 158 (goto-char from) | |
| 159 (while (not (eobp)) | |
| 160 (or (save-excursion (skip-chars-forward " \t") (eolp)) | |
| 161 (center-line)) | |
| 162 (forward-line 1))))) | |
| 163 | |
| 164 (defun center-line (&optional nlines) | |
| 165 "Center the line point is on, within the width specified by `fill-column'. | |
| 166 This means adjusting the indentation so that it equals | |
| 167 the distance between the end of the text and `fill-column'. | |
| 168 The argument NLINES says how many lines to center." | |
| 169 (interactive "P") | |
| 170 (if nlines (setq nlines (prefix-numeric-value nlines))) | |
| 171 (while (not (eq nlines 0)) | |
| 172 (save-excursion | |
| 173 (let ((lm (current-left-margin)) | |
| 174 line-length) | |
| 175 (beginning-of-line) | |
| 176 (delete-horizontal-space) | |
| 177 (end-of-line) | |
| 178 (delete-horizontal-space) | |
| 179 (setq line-length (current-column)) | |
| 180 (if (> (- fill-column lm line-length) 0) | |
| 181 (indent-line-to | |
| 182 (+ lm (/ (- fill-column lm line-length) 2)))))) | |
| 183 (cond ((null nlines) | |
| 184 (setq nlines 0)) | |
| 185 ((> nlines 0) | |
| 186 (setq nlines (1- nlines)) | |
| 187 (forward-line 1)) | |
| 188 ((< nlines 0) | |
| 189 (setq nlines (1+ nlines)) | |
| 190 (forward-line -1))))) | |
| 191 | |
| 192 ;;; text-mode.el ends here |