Mercurial > hg > xemacs-beta
annotate lisp/indent.el @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 11:02:24 -0600 |
| parents | 5b560b7374ff |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; indent.el --- indentation commands for XEmacs |
| 2 | |
| 3 ;; Copyright (C) 1985, 1992, 1993, 1995, 1997 Free Software Foundation, Inc. | |
| 814 | 4 ;; Copyright (C) 2002 Ben Wing. |
| 428 | 5 |
| 6 ;; Maintainer: FSF | |
| 7 ;; Keywords: lisp, languages, tools, dumped | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 12 ;; under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 ;; General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 23 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 24 ;; 02111-1307, USA. | |
| 25 | |
| 26 ;;; Synched up with: FSF 19.30. | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs. | |
| 31 | |
| 32 ;; Commands for making and changing indentation in text. These are | |
| 33 ;; described in the XEmacs Reference Manual. | |
| 34 | |
| 35 ;; 06/11/1997 - Convert (preceding|following)-char to char-(before|after) -slb | |
| 36 | |
| 37 ;;; Code: | |
| 38 | |
| 39 (defvar standard-indent 4 "\ | |
| 40 Default number of columns for margin-changing functions to indent.") | |
| 41 | |
| 42 (defvar indent-line-function 'indent-to-left-margin | |
| 43 "Function to indent current line.") | |
| 44 | |
| 45 (defun indent-according-to-mode () | |
| 46 "Indent line in proper way for current major mode." | |
| 47 (interactive) | |
| 48 (funcall indent-line-function)) | |
| 49 | |
| 50 (defun indent-for-tab-command (&optional prefix-arg) | |
| 51 "Indent line in proper way for current major mode." | |
| 52 (interactive "P") | |
| 53 (if (eq indent-line-function 'indent-to-left-margin) | |
| 54 (insert-tab prefix-arg) | |
| 55 (if prefix-arg | |
| 56 (funcall indent-line-function prefix-arg) | |
| 57 (funcall indent-line-function)))) | |
| 58 | |
| 59 (defun insert-tab (&optional prefix-arg) | |
| 60 (let ((count (prefix-numeric-value prefix-arg))) | |
| 61 (if abbrev-mode | |
| 62 (expand-abbrev)) | |
| 63 (if indent-tabs-mode | |
| 64 (insert-char ?\t count) | |
| 65 ;; XEmacs: (Need the `1+') | |
| 66 (indent-to (* tab-width (1+ (/ (current-column) tab-width))))))) | |
| 67 | |
| 444 | 68 (defun indent-rigidly (start end count) |
| 69 "Indent all lines starting in the region sideways by COUNT columns. | |
| 70 Called from a program, takes three arguments, START, END and COUNT." | |
| 428 | 71 (interactive "r\np") |
| 72 (save-excursion | |
| 73 (goto-char end) | |
| 74 (setq end (point-marker)) | |
| 75 (goto-char start) | |
| 76 (or (bolp) (forward-line 1)) | |
| 77 (while (< (point) end) | |
| 78 (let ((indent (current-indentation)) | |
| 79 eol-flag) | |
| 80 (save-excursion | |
| 81 (skip-chars-forward " \t") | |
| 82 (setq eol-flag (eolp))) | |
| 83 (or eol-flag | |
| 444 | 84 (indent-to (max 0 (+ indent count)) 0)) |
| 428 | 85 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) |
| 86 (forward-line 1)) | |
| 87 (move-marker end nil) | |
| 88 (setq zmacs-region-stays nil))) ; XEmacs | |
| 89 | |
| 90 (defun indent-line-to (column) | |
| 91 "Indent current line to COLUMN. | |
| 92 This function removes or adds spaces and tabs at beginning of line | |
| 93 only if necessary. It leaves point at end of indentation." | |
| 94 (back-to-indentation) | |
| 95 (let ((cur-col (current-column))) | |
| 96 (cond ((< cur-col column) | |
| 97 (if (>= (- column (* (/ cur-col tab-width) tab-width)) tab-width) | |
| 98 (delete-region (point) | |
| 99 (progn (skip-chars-backward " ") (point)))) | |
| 100 (indent-to column)) | |
| 101 ((> cur-col column) ; too far right (after tab?) | |
| 102 (delete-region (progn (move-to-column column t) (point)) | |
| 103 (progn (back-to-indentation) (point))))))) | |
| 104 | |
| 105 (defun current-left-margin () | |
| 106 "Return the left margin to use for this line. | |
| 107 This is the value of the buffer-local variable `left-margin' plus the value | |
| 108 of the `left-margin' text-property at the start of the line." | |
| 109 (save-excursion | |
| 110 (back-to-indentation) | |
| 111 (max 0 | |
| 112 (+ left-margin (or (get-text-property | |
| 113 (if (and (eobp) (not (bobp))) | |
| 114 (1- (point)) (point)) | |
| 115 'left-margin) 0))))) | |
| 116 | |
| 117 (defun move-to-left-margin (&optional n force) | |
| 118 "Move to the left margin of the current line. | |
| 119 With optional argument, move forward N-1 lines first. | |
| 120 The column moved to is the one given by the `current-left-margin' function. | |
| 121 If the line's indentation appears to be wrong, and this command is called | |
| 122 interactively or with optional argument FORCE, it will be fixed." | |
| 123 (interactive (list (prefix-numeric-value current-prefix-arg) t)) | |
| 124 (beginning-of-line n) | |
| 125 (skip-chars-forward " \t") | |
| 126 (let ((lm (current-left-margin)) | |
| 127 (cc (current-column))) | |
| 128 (cond ((> cc lm) | |
| 129 (if (> (move-to-column lm force) lm) | |
| 130 ;; If lm is in a tab and we are not forcing, move before tab | |
| 131 (backward-char 1))) | |
| 132 ((and force (< cc lm)) | |
| 133 (indent-to-left-margin))))) | |
| 134 | |
| 135 ;; This is the default indent-line-function, | |
| 136 ;; used in Fundamental Mode, Text Mode, etc. | |
| 137 (defun indent-to-left-margin () | |
| 138 "Indent current line to the column given by `current-left-margin'." | |
| 139 (indent-line-to (current-left-margin))) | |
| 140 | |
| 141 (defun delete-to-left-margin (&optional from to) | |
| 142 "Remove left margin indentation from a region. | |
| 444 | 143 The amount of indentation to delete is determined by calling the |
| 144 function `current-left-margin'. | |
| 428 | 145 In no case will it delete non-whitespace. |
| 146 Args FROM and TO are optional; default is the whole buffer." | |
| 147 (save-excursion | |
| 148 (goto-char (or to (point-max))) | |
| 149 (setq to (point-marker)) | |
| 150 (goto-char (or from (point-min))) | |
| 151 (or (bolp) (forward-line 1)) | |
| 152 (while (< (point) to) | |
| 153 (delete-region (point) (progn (move-to-left-margin nil t) (point))) | |
| 154 (forward-line 1)) | |
| 155 (move-marker to nil))) | |
| 156 | |
| 157 (defun set-left-margin (from to lm) | |
| 158 "Set the left margin of the region to WIDTH. | |
| 159 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 160 (interactive "r\nNSet left margin to column: ") | |
| 161 (if (interactive-p) (setq lm (prefix-numeric-value lm))) | |
| 162 (save-excursion | |
| 163 ;; If inside indentation, start from BOL. | |
| 164 (goto-char from) | |
| 165 (skip-chars-backward " \t") | |
| 166 (if (bolp) (setq from (point))) | |
| 167 ;; Place end after whitespace | |
| 168 (goto-char to) | |
| 169 (skip-chars-forward " \t") | |
| 170 (setq to (point-marker))) | |
| 171 ;; Delete margin indentation first, but keep paragraph indentation. | |
| 172 (delete-to-left-margin from to) | |
| 173 (put-text-property from to 'left-margin lm) | |
| 174 (indent-rigidly from to lm) | |
| 175 (if auto-fill-function (save-excursion (fill-region from to nil t t))) | |
| 176 (move-marker to nil)) | |
| 177 | |
| 178 (defun set-right-margin (from to lm) | |
| 179 "Set the right margin of the region to WIDTH. | |
| 180 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 181 (interactive "r\nNSet right margin to width: ") | |
| 182 (if (interactive-p) (setq lm (prefix-numeric-value lm))) | |
| 183 (save-excursion | |
| 184 (goto-char from) | |
| 185 (skip-chars-backward " \t") | |
| 186 (if (bolp) (setq from (point)))) | |
| 187 (put-text-property from to 'right-margin lm) | |
| 188 (if auto-fill-function (save-excursion (fill-region from to nil t t)))) | |
| 189 | |
| 190 (defun alter-text-property (from to prop func &optional object) | |
| 191 "Programmatically change value of a text-property. | |
| 192 For each region between FROM and TO that has a single value for PROPERTY, | |
| 193 apply FUNCTION to that value and sets the property to the function's result. | |
| 194 Optional fifth argument OBJECT specifies the string or buffer to operate on." | |
| 195 (let ((begin from) | |
| 196 end val) | |
| 197 (while (setq val (get-text-property begin prop object) | |
| 198 end (text-property-not-all begin to prop val object)) | |
| 199 (put-text-property begin end prop (funcall func val) object) | |
| 200 (setq begin end)) | |
| 201 (if (< begin to) | |
| 202 (put-text-property begin to prop (funcall func val) object)))) | |
| 203 | |
| 204 (defun increase-left-margin (from to inc) | |
| 205 "Increase or decrease the left-margin of the region. | |
| 206 With no prefix argument, this adds `standard-indent' of indentation. | |
| 207 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 208 to change the margin by, in characters. | |
| 209 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 210 (interactive "*r\nP") | |
| 211 (setq inc (if inc (prefix-numeric-value inc) standard-indent)) | |
| 212 (save-excursion | |
| 213 (goto-char from) | |
| 214 (skip-chars-backward " \t") | |
| 215 (if (bolp) (setq from (point))) | |
| 216 (goto-char to) | |
| 217 (setq to (point-marker))) | |
| 218 (alter-text-property from (marker-position to) 'left-margin ; XEmacs | |
| 219 (lambda (v) (max (- left-margin) (+ inc (or v 0))))) | |
| 220 (indent-rigidly from (marker-position to) inc) ; XEmacs | |
| 221 (if auto-fill-function | |
| 222 (save-excursion | |
| 223 (fill-region from (marker-position to) nil t t))) ; XEmacs | |
| 224 (move-marker to nil)) | |
| 225 | |
| 226 (defun decrease-left-margin (from to inc) | |
| 227 "Make the left margin of the region smaller. | |
| 228 With no prefix argument, decrease the indentation by `standard-indent'. | |
| 229 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 230 to change the margin by, in characters. | |
| 231 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 232 (interactive "*r\nP") | |
| 233 (setq inc (if inc (prefix-numeric-value inc) standard-indent)) | |
| 234 (increase-left-margin from to (- inc))) | |
| 235 | |
| 236 (defun increase-right-margin (from to inc) | |
| 237 "Increase the right-margin of the region. | |
| 238 With no prefix argument, increase the right margin by `standard-indent'. | |
| 239 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 240 to change the margin by, in characters. A negative argument decreases | |
| 241 the right margin width. | |
| 242 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 243 (interactive "r\nP") | |
| 244 (if (interactive-p) | |
| 245 (setq inc (if inc (prefix-numeric-value current-prefix-arg) | |
| 246 standard-indent))) | |
| 247 (save-excursion | |
| 248 (alter-text-property from to 'right-margin | |
| 249 (lambda (v) (+ inc (or v 0)))) | |
| 250 (if auto-fill-function | |
| 251 (fill-region from to nil t t)))) | |
| 252 | |
| 253 (defun decrease-right-margin (from to inc) | |
| 254 "Make the right margin of the region smaller. | |
| 255 With no prefix argument, decrease the right margin by `standard-indent'. | |
| 256 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 257 of width to remove, in characters. A negative argument increases | |
| 258 the right margin width. | |
| 259 If `auto-fill-mode' is active, re-fills region to fit in new margin." | |
| 260 (interactive "*r\nP") | |
| 261 (setq inc (if inc (prefix-numeric-value inc) standard-indent)) | |
| 262 (increase-right-margin from to (- inc))) | |
| 263 | |
| 264 (defun beginning-of-line-text (&optional n) | |
| 265 "Move to the beginning of the text on this line. | |
| 266 With optional argument, move forward N-1 lines first. | |
| 267 From the beginning of the line, moves past the left-margin indentation, the | |
| 268 fill-prefix, and any indentation used for centering or right-justifying the | |
| 444 | 269 line, but does not move past any whitespace that was explicitly inserted |
| 428 | 270 \(such as a tab used to indent the first line of a paragraph)." |
| 271 (interactive "p") | |
| 272 (beginning-of-line n) | |
| 273 (skip-chars-forward " \t") | |
| 274 ;; Skip over fill-prefix. | |
| 444 | 275 (if (and fill-prefix |
| 428 | 276 (not (string-equal fill-prefix ""))) |
| 277 (if (equal fill-prefix | |
| 444 | 278 (buffer-substring |
| 428 | 279 (point) (min (point-max) (+ (length fill-prefix) (point))))) |
| 280 (forward-char (length fill-prefix))) | |
| 281 (if (and adaptive-fill-mode adaptive-fill-regexp | |
| 282 (looking-at adaptive-fill-regexp)) | |
| 283 (goto-char (match-end 0)))) | |
| 284 ;; Skip centering or flushright indentation | |
| 285 (if (memq (current-justification) '(center right)) | |
| 286 (skip-chars-forward " \t"))) | |
| 287 | |
| 288 (defvar indent-region-function nil | |
| 289 "Short cut function to indent region using `indent-according-to-mode'. | |
| 290 A value of nil means really run `indent-according-to-mode' on each line.") | |
| 291 | |
|
4812
5b560b7374ff
Make COLUMN optional in #'indent-region, as in GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
814
diff
changeset
|
292 (defun indent-region (start end &optional column) |
| 428 | 293 "Indent each nonblank line in the region. |
| 294 With no argument, indent each line using `indent-according-to-mode', | |
| 295 or use `indent-region-function' to do the whole region if that's non-nil. | |
| 296 If there is a fill prefix, make each line start with the fill prefix. | |
| 297 With argument COLUMN, indent each line to that column. | |
| 298 Called from a program, takes three args: START, END and COLUMN." | |
| 299 (interactive "r\nP") | |
| 300 (if (null column) | |
| 301 (if fill-prefix | |
| 302 (save-excursion | |
| 303 (goto-char end) | |
| 304 (setq end (point-marker)) | |
| 305 (goto-char start) | |
| 306 (let ((regexp (regexp-quote fill-prefix))) | |
| 307 (while (< (point) end) | |
| 308 (or (looking-at regexp) | |
| 309 (and (bolp) (eolp)) | |
| 310 (insert fill-prefix)) | |
| 311 (forward-line 1)))) | |
| 312 (if indent-region-function | |
| 313 (funcall indent-region-function start end) | |
| 314 (save-excursion | |
| 315 (goto-char end) | |
| 316 (setq end (point-marker)) | |
| 317 (goto-char start) | |
| 318 (or (bolp) (forward-line 1)) | |
| 319 (while (< (point) end) | |
| 320 (or (and (bolp) (eolp)) | |
| 321 (funcall indent-line-function)) | |
| 322 (forward-line 1)) | |
| 323 (move-marker end nil)))) | |
| 324 (setq column (prefix-numeric-value column)) | |
| 325 (save-excursion | |
| 326 (goto-char end) | |
| 327 (setq end (point-marker)) | |
| 328 (goto-char start) | |
| 329 (or (bolp) (forward-line 1)) | |
| 330 (while (< (point) end) | |
| 331 (delete-region (point) (progn (skip-chars-forward " \t") (point))) | |
| 332 (or (eolp) | |
| 333 (indent-to column 0)) | |
| 334 (forward-line 1)) | |
| 335 (move-marker end nil)))) | |
| 336 | |
| 814 | 337 (defvar indent-balanced-expression-function nil |
| 338 "Short cut function to indent balanced expression. | |
| 339 A value of nil means really run `indent-according-to-mode' on each line of | |
| 340 balanced expression as computed with `forward-sexp'.") | |
| 341 | |
| 342 (defun indent-balanced-expression () | |
| 343 "Indent each nonblank line in the balanced expression at point. | |
| 344 Use `indent-balanced-expression-function' if that's non-nil, or find | |
| 345 expression with `forward-sexp' and use `indent-region' on result." | |
| 346 (interactive "") | |
| 347 (let ((fun (or indent-balanced-expression-function | |
| 348 (cond ((memq major-mode '(c-mode c++-mode java-mode objc-mode | |
| 349 idl-mode pike-mode | |
| 350 c++-c-mode elec-c-mode)) | |
| 351 'c-indent-exp) | |
| 352 ((memq major-mode | |
| 353 '(lisp-mode | |
| 354 emacs-lisp-mode lisp-interaction-mode | |
| 355 scheme-mode inferior-scheme-mode | |
| 356 scheme-interaction-mode)) | |
| 357 'indent-sexp))))) | |
| 358 (if fun (funcall fun) | |
| 359 (let ((end (save-excursion (forward-sexp) (point)))) | |
| 360 (indent-region (point) end nil))))) | |
| 361 | |
| 362 (defun indent-region-or-balanced-expression () | |
| 363 "Indent region if active, or balanced expression at point. | |
| 364 See `indent-region' and `indent-balanced-expression'." | |
| 365 (interactive "") | |
| 366 (if (region-active-p) | |
| 367 (indent-region (region-beginning) (region-end) nil) | |
| 368 (indent-balanced-expression))) | |
| 369 | |
| 428 | 370 (defun indent-relative-maybe () |
| 371 "Indent a new line like previous nonblank line." | |
| 372 (interactive) | |
| 373 (indent-relative t)) | |
| 374 | |
| 375 (defun indent-relative (&optional unindented-ok) | |
| 376 "Space out to under next indent point in previous nonblank line. | |
| 377 An indent point is a non-whitespace character following whitespace. | |
| 378 If the previous nonblank line has no indent points beyond the | |
| 379 column point starts at, `tab-to-tab-stop' is done instead." | |
| 380 (interactive "P") | |
| 381 (if abbrev-mode (expand-abbrev)) | |
| 382 (let ((start-column (current-column)) | |
| 383 indent) | |
| 384 (save-excursion | |
| 385 (beginning-of-line) | |
| 386 (if (re-search-backward "^[^\n]" nil t) | |
| 387 (let ((end (save-excursion (forward-line 1) (point)))) | |
| 388 (move-to-column start-column) | |
| 389 ;; Is start-column inside a tab on this line? | |
| 390 (if (> (current-column) start-column) | |
| 391 (backward-char 1)) | |
| 392 (or (looking-at "[ \t]") | |
| 393 unindented-ok | |
| 394 (skip-chars-forward "^ \t" end)) | |
| 395 (skip-chars-forward " \t" end) | |
| 396 (or (= (point) end) (setq indent (current-column)))))) | |
| 397 (if indent | |
| 398 (let ((opoint (point-marker))) | |
| 399 (delete-region (point) (progn (skip-chars-backward " \t") (point))) | |
| 400 (indent-to indent 0) | |
| 401 (if (> opoint (point)) | |
| 402 (goto-char opoint)) | |
| 403 (move-marker opoint nil)) | |
| 404 (tab-to-tab-stop)))) | |
| 405 | |
| 406 (defvar tab-stop-list | |
| 407 '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120) | |
| 408 "*List of tab stop positions used by `tab-to-tab-stops'. | |
| 409 This should be a list of integers, ordered from smallest to largest.") | |
| 410 | |
| 411 (defvar edit-tab-stops-map nil "Keymap used in `edit-tab-stops'.") | |
| 412 (if edit-tab-stops-map | |
| 413 nil | |
| 414 (setq edit-tab-stops-map (make-sparse-keymap)) | |
| 415 (define-key edit-tab-stops-map "\C-x\C-s" 'edit-tab-stops-note-changes) | |
| 416 (define-key edit-tab-stops-map "\C-c\C-c" 'edit-tab-stops-note-changes)) | |
| 417 | |
| 418 (defvar edit-tab-stops-buffer nil | |
| 419 "Buffer whose tab stops are being edited--in case | |
| 420 the variable `tab-stop-list' is local in that buffer.") | |
| 421 | |
| 422 (defun edit-tab-stops () | |
| 423 "Edit the tab stops used by `tab-to-tab-stop'. | |
| 424 Creates a buffer *Tab Stops* containing text describing the tab stops. | |
| 425 A colon indicates a column where there is a tab stop. | |
| 426 You can add or remove colons and then do \\<edit-tab-stops-map>\\[edit-tab-stops-note-changes] to make changes take effect." | |
| 427 (interactive) | |
| 428 (setq edit-tab-stops-buffer (current-buffer)) | |
| 429 (switch-to-buffer (get-buffer-create "*Tab Stops*")) | |
| 430 ;; #### I18N3 should mark buffer as output-translating | |
| 431 (use-local-map edit-tab-stops-map) | |
| 432 (make-local-variable 'indent-tabs-mode) | |
| 433 (setq indent-tabs-mode nil) | |
| 434 (overwrite-mode 1) | |
| 435 (setq truncate-lines t) | |
| 436 (erase-buffer) | |
| 437 (let ((tabs tab-stop-list)) | |
| 438 (while tabs | |
| 439 (indent-to (car tabs) 0) | |
| 440 (insert ?:) | |
| 441 (setq tabs (cdr tabs)))) | |
| 442 (let ((count 0)) | |
| 443 (insert ?\n) | |
| 444 (while (< count 8) | |
| 445 (insert (+ count ?0)) | |
| 446 (insert " ") | |
| 447 (setq count (1+ count))) | |
| 448 (insert ?\n) | |
| 449 (while (> count 0) | |
| 450 (insert "0123456789") | |
| 451 (setq count (1- count)))) | |
| 452 ;; XEmacs | |
| 453 (insert (substitute-command-keys "\nTo install changes, type \\<edit-tab-stops-map>\\[edit-tab-stops-note-changes]")) | |
| 454 (goto-char (point-min))) | |
| 455 | |
| 456 (defun edit-tab-stops-note-changes () | |
| 457 "Put edited tab stops into effect." | |
| 458 (interactive) | |
| 459 (let (tabs) | |
| 460 (save-excursion | |
| 461 (goto-char 1) | |
| 462 (end-of-line) | |
| 463 (while (search-backward ":" nil t) | |
| 464 (setq tabs (cons (current-column) tabs)))) | |
| 465 (bury-buffer (prog1 (current-buffer) | |
| 466 (switch-to-buffer edit-tab-stops-buffer))) | |
| 467 (setq tab-stop-list tabs)) | |
| 468 (message "Tab stops installed")) | |
| 469 | |
| 470 (defun tab-to-tab-stop () | |
| 471 "Insert spaces or tabs to next defined tab-stop column. | |
| 472 The variable `tab-stop-list' is a list of columns at which there are tab stops. | |
| 473 Use \\[edit-tab-stops] to edit them interactively." | |
| 474 (interactive) | |
| 475 (and abbrev-mode (eq (char-syntax (char-before (point))) ?w) | |
| 476 (expand-abbrev)) | |
| 477 (let ((tabs tab-stop-list)) | |
| 478 (while (and tabs (>= (current-column) (car tabs))) | |
| 479 (setq tabs (cdr tabs))) | |
| 480 (if tabs | |
| 481 (let ((opoint (point))) | |
| 482 (skip-chars-backward " \t") | |
| 483 (delete-region (point) opoint) | |
| 484 (indent-to (car tabs))) | |
| 485 (insert ?\ )))) | |
| 486 | |
| 487 (defun move-to-tab-stop () | |
| 488 "Move point to next defined tab-stop column. | |
| 489 The variable `tab-stop-list' is a list of columns at which there are tab stops. | |
| 490 Use \\[edit-tab-stops] to edit them interactively." | |
| 491 (interactive) | |
| 492 (let ((tabs tab-stop-list)) | |
| 493 (while (and tabs (>= (current-column) (car tabs))) | |
| 494 (setq tabs (cdr tabs))) | |
| 495 (if tabs | |
| 496 (let ((before (point))) | |
| 497 (move-to-column (car tabs) t) | |
| 498 (save-excursion | |
| 499 (goto-char before) | |
| 500 ;; If we just added a tab, or moved over one, | |
| 501 ;; delete any superfluous spaces before the old point. | |
| 502 (if (and (eq (char-before (point)) ?\ ) | |
| 503 (eq (char-after (point)) ?\t)) | |
| 504 (let ((tabend (* (/ (current-column) tab-width) tab-width))) | |
| 505 (while (and (> (current-column) tabend) | |
| 506 (eq (char-before (point)) ?\ )) | |
| 446 | 507 (backward-char 1)) |
| 428 | 508 (delete-region (point) before)))))))) |
| 509 | |
| 510 ;(define-key global-map "\t" 'indent-for-tab-command) | |
| 511 ;(define-key esc-map "\034" 'indent-region) | |
| 512 ;(define-key ctl-x-map "\t" 'indent-rigidly) | |
| 513 ;(define-key esc-map "i" 'tab-to-tab-stop) | |
| 514 | |
| 515 ;;; indent.el ends here |