Mercurial > hg > xemacs-beta
annotate src/insdel.h @ 5655:b7ae5f44b950
Remove some redundant functions, change others to labels, lisp/
lisp/ChangeLog addition:
2012-05-05 Aidan Kehoe <kehoea@parhasard.net>
Remove some redundant functions; turn other utility functions into
labels, avoiding visibility in the global namespace, and reducing
the size of the dumped binary.
* auto-save.el (auto-save-unhex): Removed.
* auto-save.el (auto-save-unescape-name): Use #'string-to-number
instead of #'auto-save-unhex.
* files.el (save-some-buffers):
* files.el (save-some-buffers-1): Changed to a label.
* files.el (not-modified):
* gui.el (make-gui-button):
* gui.el (gui-button-action): Changed to a label.
* gui.el (insert-gui-button):
* indent.el (indent-for-tab-command):
* indent.el (insert-tab): Changed to a label.
* indent.el (indent-rigidly):
* isearch-mode.el:
* isearch-mode.el (isearch-ring-adjust):
* isearch-mode.el (isearch-ring-adjust1): Changed to a label.
* isearch-mode.el (isearch-pre-command-hook):
* isearch-mode.el (isearch-maybe-frob-keyboard-macros): Changed to
a label.
* isearch-mode.el (isearch-highlight):
* isearch-mode.el (isearch-make-extent): Changed to a label.
* itimer.el:
* itimer.el (itimer-decrement): Removed, replaced uses with decf.
* itimer.el (itimer-increment): Removed, replaced uses with incf.
* itimer.el (itimer-signum): Removed, replaced uses with minusp, plusp.
* itimer.el (itimer-name):
* itimer.el (check-itimer): Removed, replaced with #'check-type calls.
* itimer.el (itimer-value):
* itimer.el (check-itimer-coerce-string): Removed.
* itimer.el (itimer-restart):
* itimer.el (itimer-function):
* itimer.el (check-nonnegative-number): Removed.
* itimer.el (itimer-uses-arguments):
* itimer.el (check-string): Removed.
* itimer.el (itimer-function-arguments):
* itimer.el (itimer-recorded-run-time):
* itimer.el (set-itimer-name):
* itimer.el (set-itimer-value):
* itimer.el (set-itimer-value-internal):
* itimer.el (set-itimer-restart):
* itimer.el (set-itimer-function):
* itimer.el (set-itimer-is-idle):
* itimer.el (set-itimer-recorded-run-time):
* itimer.el (get-itimer):
* itimer.el (delete-itimer):
* itimer.el (start-itimer):
* itimer.el (activate-itimer):
* itimer.el (itimer-edit-set-field):
* itimer.el (itimer-edit-next-field):
* itimer.el (itimer-edit-previous-field):
Use incf, decf, plusp, minusp and the more general argument type
checking macros.
* lib-complete.el:
* lib-complete.el (lib-complete:better-root): Changed to a label.
* lib-complete.el (lib-complete:get-completion-table): Changed to
a label.
* lib-complete.el (read-library-internal): Include labels.
* lib-complete.el (lib-complete:cache-completions): Changed to a
label.
* minibuf.el (read-buffer): Use #'set-difference, don't reinvent it.
* newcomment.el (comment-padright): Use a label instead of
repeating a lambda expression.
* packages.el (package-get-key):
* packages.el (package-get-key-1): Removed, use #'getf instead.
* simple.el (kill-backward-chars): Removed; this isn't used.
* simple.el (what-cursor-position):
(lambda (arg) (format "%S" arg) -> #'prin1-to-string.
* simple.el (debug-print-1): Renamed to #'debug-print.
* simple.el (debug-print): Removed, #'debug-print-1 was equivalent.
* subr.el (integer-to-bit-vector): check-nonnegative-number no
longer available.
* widget.el (define-widget):
* widget.el (define-widget-keywords): Removed, this was long obsolete.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 05 May 2012 18:42:00 +0100 |
| parents | 308d34e9f07d |
| children | 65d65b52d608 |
| rev | line source |
|---|---|
| 428 | 1 /* Buffer insertion/deletion and gap motion for XEmacs. |
| 2 Copyright (C) 1985-1994 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4953
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 7 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4953
diff
changeset
|
8 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4953
diff
changeset
|
9 option) any later version. |
| 428 | 10 |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4953
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 18 |
| 19 /* Synched up with: Not in FSF. */ | |
| 20 | |
| 21 /* Mostly rewritten by Ben Wing. */ | |
| 22 | |
| 440 | 23 #ifndef INCLUDED_insdel_h_ |
| 24 #define INCLUDED_insdel_h_ | |
| 428 | 25 |
| 26 /************************************************************************/ | |
| 27 /* changing a buffer's text */ | |
| 28 /************************************************************************/ | |
| 29 | |
| 665 | 30 int begin_multiple_change (struct buffer *buf, Charbpos start, Charbpos end); |
| 428 | 31 void end_multiple_change (struct buffer *buf, int count); |
| 32 | |
| 33 /* flags for functions below */ | |
| 34 | |
| 35 #define INSDEL_BEFORE_MARKERS 1 | |
| 36 #define INSDEL_NO_LOCKING 2 | |
| 37 | |
| 665 | 38 Charcount buffer_insert_string_1 (struct buffer *buf, Charbpos pos, |
| 867 | 39 const Ibyte *nonreloc, Lisp_Object reloc, |
| 428 | 40 Bytecount offset, Bytecount length, |
| 41 int flags); | |
| 665 | 42 Charcount buffer_insert_raw_string_1 (struct buffer *buf, Charbpos pos, |
| 867 | 43 const Ibyte *nonreloc, |
| 428 | 44 Bytecount length, int flags); |
| 665 | 45 Charcount buffer_insert_lisp_string_1 (struct buffer *buf, Charbpos pos, |
| 428 | 46 Lisp_Object str, int flags); |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
867
diff
changeset
|
47 Charcount buffer_insert_ascstring_1 (struct buffer *buf, Charbpos pos, |
|
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
867
diff
changeset
|
48 const Ascbyte *s, int flags); |
| 665 | 49 Charcount buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos, |
| 867 | 50 Ichar ch, int flags); |
| 665 | 51 Charcount buffer_insert_c_char_1 (struct buffer *buf, Charbpos pos, char c, |
| 428 | 52 int flags); |
| 665 | 53 Charcount buffer_insert_from_buffer_1 (struct buffer *buf, Charbpos pos, |
| 54 struct buffer *buf2, Charbpos pos2, | |
| 428 | 55 Charcount length, int flags); |
| 56 | |
| 57 /* Macros for insertion functions that insert at point after markers. | |
| 58 All of these can GC. */ | |
| 59 | |
| 60 #define buffer_insert_string(buf, nonreloc, reloc, offset, length) \ | |
| 61 buffer_insert_string_1 (buf, -1, nonreloc, reloc, offset, length, 0) | |
| 62 #define buffer_insert_raw_string(buf, string, length) \ | |
| 63 buffer_insert_raw_string_1 (buf, -1, string, length, 0) | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
867
diff
changeset
|
64 #define buffer_insert_ascstring(buf, s) \ |
|
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
867
diff
changeset
|
65 buffer_insert_ascstring_1 (buf, -1, s, 0) |
| 428 | 66 #define buffer_insert_lisp_string(buf, str) \ |
| 67 buffer_insert_lisp_string_1 (buf, -1, str, 0) | |
| 68 #define buffer_insert_c_char(buf, c) \ | |
| 69 buffer_insert_c_char_1 (buf, -1, c, 0) | |
| 70 #define buffer_insert_emacs_char(buf, ch) \ | |
| 71 buffer_insert_emacs_char_1 (buf, -1, ch, 0) | |
| 72 #define buffer_insert_from_buffer(buf, b, index, length) \ | |
| 73 buffer_insert_from_buffer_1 (buf, -1, b, index, length, 0) | |
| 74 | |
| 665 | 75 void buffer_delete_range (struct buffer *buf, Charbpos from, Charbpos to, |
| 428 | 76 int flags); |
| 867 | 77 void buffer_replace_char (struct buffer *b, Charbpos pos, Ichar ch, |
| 428 | 78 int not_real_change, int force_lock_check); |
| 79 | |
| 80 | |
| 81 /************************************************************************/ | |
| 82 /* tracking buffer changes */ | |
| 83 /************************************************************************/ | |
| 84 | |
| 85 /* Split into two parts. One part goes with a buffer's text (possibly | |
| 86 shared), the other with the buffer itself. */ | |
| 87 | |
| 88 struct buffer_text_change_data | |
| 89 { | |
| 90 /* multiple change stuff */ | |
| 91 int in_multiple_change; | |
| 665 | 92 Charbpos mc_begin, mc_orig_end, mc_new_end; |
| 428 | 93 int mc_begin_signaled; |
| 94 }; | |
| 95 | |
| 96 struct each_buffer_change_data | |
| 97 { | |
| 98 Charcount begin_unchanged, end_unchanged; | |
| 99 /* redisplay needs to know if a newline was deleted so its | |
| 100 incremental-redisplay algorithm will fail */ | |
| 101 int newline_was_deleted; | |
| 102 Charcount begin_extent_unchanged, end_extent_unchanged; | |
| 103 }; | |
| 104 | |
| 105 /* Number of characters at the beginning and end of the buffer that | |
| 106 have not changed since the last call to buffer_reset_changes(). | |
| 107 If no changes have occurred since then, both values will be -1. | |
| 108 | |
| 109 "Changed" means that the text has changed. */ | |
| 110 | |
| 111 #define BUF_BEGIN_UNCHANGED(buf) ((buf)->changes->begin_unchanged) | |
| 112 #define BUF_END_UNCHANGED(buf) ((buf)->changes->end_unchanged) | |
| 113 | |
| 114 /* Number of characters at the beginning and end of the buffer that | |
| 115 have not had a covering extent change since the last call to | |
| 116 buffer_reset_changes (). If no changes have occurred since then, | |
| 117 both values will be -1. | |
| 118 | |
| 119 "Changed" means that the extents covering the text have changed. */ | |
| 120 | |
| 121 #define BUF_EXTENT_BEGIN_UNCHANGED(buf) \ | |
| 122 ((buf)->changes->begin_extent_unchanged) | |
| 123 #define BUF_EXTENT_END_UNCHANGED(buf) \ | |
| 124 ((buf)->changes->end_extent_unchanged) | |
| 125 | |
| 126 #define BUF_NEWLINE_WAS_DELETED(buf) \ | |
| 127 ((buf)->changes->newline_was_deleted) | |
| 128 | |
| 129 void buffer_extent_signal_changed_region (struct buffer *buf, | |
| 665 | 130 Charbpos start, |
| 131 Charbpos end); | |
| 428 | 132 void buffer_reset_changes (struct buffer *buf); |
| 133 | |
| 134 | |
| 135 | |
| 136 /************************************************************************/ | |
| 137 /* other related functions */ | |
| 138 /************************************************************************/ | |
| 139 | |
| 665 | 140 Membpos do_marker_adjustment (Membpos mpos, Membpos from, |
| 141 Membpos to, Bytecount amount); | |
| 428 | 142 |
| 867 | 143 void fixup_internal_substring (const Ibyte *nonreloc, |
| 428 | 144 Lisp_Object reloc, |
| 145 Bytecount offset, Bytecount *len); | |
| 146 | |
| 147 /* In font-lock.c */ | |
| 148 void font_lock_maybe_update_syntactic_caches (struct buffer *buf, | |
| 665 | 149 Charbpos start, |
| 150 Charbpos orig_end, | |
| 151 Charbpos new_end); | |
| 428 | 152 void font_lock_buffer_was_killed (struct buffer *buf); |
| 153 | |
| 665 | 154 void barf_if_buffer_read_only (struct buffer *buf, Charbpos from, |
| 155 Charbpos to); | |
| 428 | 156 |
| 157 void init_buffer_text (struct buffer *b); | |
| 158 void uninit_buffer_text (struct buffer *b); | |
| 159 | |
| 440 | 160 #endif /* INCLUDED_insdel_h_ */ |