Mercurial > hg > xemacs-beta
diff lisp/abbrev.el @ 814:a634e3b7acc8
[xemacs-hg @ 2002-04-14 12:41:59 by ben]
latest changes
TODO.ben-mule-21-5: Update.
make-docfile.c: Add basic support for handling ISO 2022 doc strings -- we parse
the basic charset designation sequences so we know whether we're
in ASCII and have to pay attention to end quotes and such.
Reformat code according to coding standards.
abbrev.el: Add `global-abbrev-mode', which turns on or off abbrev-mode in all
buffers. Added `defining-abbrev-turns-on-abbrev-mode' -- if
non-nil, defining an abbrev through an interactive function will
automatically turn on abbrev-mode, either globally or locally
depending on the command. This is the "what you'd expect"
behavior.
indent.el: general function for indenting a balanced expression in a
mode-correct way. Works similar to indent-region in that a mode
can specify a specific command to do the whole operation; if not,
figure out the region using forward-sexp and indent each line
using indent-according-to-mode.
keydefs.el: Removed.
Modify M-C-backslash to do indent-region-or-balanced-expression.
Make S-Tab just insert a TAB char, like it's meant to do.
make-docfile.el: Now that we're using the call-process-in-lisp, we need to load
an extra file win32-native.el because we're running a bare temacs.
menubar-items.el: Totally redo the Cmds menu so that most used commands appear
directly on the menu and less used commands appear in submenus.
The old way may have been very pretty, but rather impractical.
process.el: Under Windows, don't ever use old-call-process-internal, even
in batch mode. We can do processes in batch mode.
subr.el: Someone recoded truncate-string-to-width, saying "the FSF version
is too complicated and does lots of hard-to-understand stuff" but
the resulting recoded version was *totally* wrong! it
misunderstood the basic point of this function, which is work in
*columns* not chars. i dumped ours and copied the version from
FSF 21.1. Also added truncate-string-with-continuation-dots,
since this idiom is used often.
config.inc.samp, xemacs.mak: Separate out debug and optimize flags.
Remove all vestiges of USE_MINIMAL_TAGBITS,
USE_INDEXED_LRECORD_IMPLEMENTATION, and GUNG_HO, since those
ifdefs have long been removed.
Make error-checking support actually work.
Some rearrangement of config.inc.samp to make it more logical.
Remove callproc.c and ntproc.c from xemacs.mak, no longer used.
Make pdump the default.
lisp.h: Add support for strong type-checking of Bytecount, Bytebpos,
Charcount, Charbpos, and others, by making them classes,
overloading the operators to provide integer-like operation and
carefully controlling what operations are allowed. Not currently
enabled in C++ builds because there are still a number of compile
errors, and it won't really work till we merge in my "8-bit-Mule"
workspace, in which I make use of the new types Charxpos,
Bytexpos, Memxpos, representing a "position" either in a buffer or
a string. (This is especially important in the extent code.)
abbrev.c, alloc.c, eval.c, buffer.c, buffer.h, editfns.c, fns.c, text.h: Warning fixes, some of them related to new C++ strict type
checking of Bytecount, Charbpos, etc.
dired.c: Caught an actual error due to strong type checking -- char len
being passed when should be byte len.
alloc.c, backtrace.h, bytecode.c, bytecode.h, eval.c, sysdep.c: Further optimize Ffuncall:
-- process arg list at compiled-function creation time, converting
into an array for extra-quick access at funcall time.
-- rewrite funcall_compiled_function to use it, and inline this
function.
-- change the order of check for magic stuff in
SPECBIND_FAST_UNSAFE to be faster.
-- move the check for need to garbage collect into the allocation
code, so only a single flag needs to be checked in funcall.
buffer.c, symbols.c: add debug funs to check on mule optimization info in buffers and
strings.
eval.c, emacs.c, text.c, regex.c, scrollbar-msw.c, search.c: Fix evil crashes due to eistrings not properly reinitialized under
pdump. Redo a bit some of the init routines; convert some
complex_vars_of() into simple vars_of(), because they didn't need
complex processing.
callproc.c, emacs.c, event-stream.c, nt.c, process.c, process.h, sysdep.c, sysdep.h, syssignal.h, syswindows.h, ntproc.c: Delete. Hallelujah, praise the Lord, there is no god
but Allah!!!
fix so that processes can be invoked in bare temacs -- thereby
eliminating any need for callproc.c. (currently only eliminated
under NT.) remove all crufty and unnecessary old process code in
ntproc.c and elsewhere. move non-callproc-specific stuff (mostly
environment) into process.c, so callproc.c can be left out under
NT.
console-tty.c, doc.c, file-coding.c, file-coding.h, lstream.c, lstream.h: fix doc string handling so it works with Japanese, etc docs.
change handling of "character mode" so callers don't have to
manually set it (quite error-prone).
event-msw.c: spacing fixes.
lread.c: eliminate unused crufty vintage-19 "FSF defun hack" code.
lrecord.h: improve pdump description docs.
buffer.c, ntheap.c, unexnt.c, win32.c, emacs.c: Mule-ize some unexec and startup code. It was pseudo-Mule-ized
before by simply always calling the ...A versions of functions,
but that won't cut it -- eventually we want to be able to run
properly even if XEmacs has been installed in a Japanese
directory. (The current problem is the timing of the loading of
the Unicode tables; this will eventually be fixed.) Go through and
fix various other places where the code was not Mule-clean.
Provide a function mswindows_get_module_file_name() to get our own
name without resort to PATH_MAX and such. Add a big comment in
main() about the problem with Unicode table load timing that I
just alluded to.
emacs.c: When error-checking is enabled (interpreted as "user is developing
XEmacs"), don't ask user to "pause to read messages" when a fatal
error has occurred, because it will wedge if we are in an inner
modal loop (typically when a menu is popped up) and make us unable
to get a useful stack trace in the debugger.
text.c: Correct update_entirely_ascii_p_flag to actually work.
lisp.h, symsinit.h: declarations for above changes.
author | ben |
---|---|
date | Sun, 14 Apr 2002 12:43:31 +0000 |
parents | 1ccc32a20af4 |
children | 69c43a181729 |
line wrap: on
line diff
--- a/lisp/abbrev.el Sat Apr 13 20:44:53 2002 +0000 +++ b/lisp/abbrev.el Sun Apr 14 12:43:31 2002 +0000 @@ -1,6 +1,7 @@ ;;; abbrev.el --- abbrev mode commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1992, 1997 Free Software Foundation, Inc. +;; Copyright (C) 2002 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: abbrev, dumped @@ -37,17 +38,28 @@ :tag "Abbreviations" :group 'editing) -(defgroup abbrev-mode nil +(defcustom abbrev-mode nil "Word abbreviations mode." + :initialize #'set-default + :set #'(lambda (sym val) + (global-abbrev-mode (if val 1 0))) :group 'abbrev) -;jwz: this is preloaded so don't ;;;###autoload -(defcustom only-global-abbrevs nil "\ -*Non-nil means user plans to use global abbrevs only. +(defcustom only-global-abbrevs nil + "*Non-nil means user plans to use global abbrevs only. Makes the commands to define mode-specific abbrevs define global ones instead." :type 'boolean :group 'abbrev) +(defcustom defining-abbrev-turns-on-abbrev-mode t + "*NOn-nil turns on abbrev-mode whenever an abbrev is defined. +This occurs only when the user-level commands (e.g. `add-global-abbrev') +are used. abbrev-mode is turned on in all buffers or the current-buffer +only, depending on whether a global or mode-specific abbrev is defined." + ;;#### should turn on in all buffers of current mode in mode-specific abbrev! + :type 'boolean + :group 'abbrev) + ;;; XEmacs: the following block of code is not in FSF (defvar abbrev-table-name-list '() "List of symbols whose values are abbrev tables.") @@ -66,7 +78,6 @@ (setq abbrevs-changed t) nil) - (defun define-abbrev-table (table-name definitions) "Define TABLE-NAME (a symbol) as an abbrev table name. Define abbrevs in it according to DEFINITIONS, which is a list of elements @@ -270,6 +281,22 @@ ;; XEmacs change (redraw-modeline)) +;; XEmacs change +(defun global-abbrev-mode (arg) + "Toggle abbrev mode in all buffers. +With argument ARG, enable abbrev mode globally if ARG is positive, else +disable. In abbrev mode, inserting an abbreviation causes it to expand +and be replaced by its expansion." + (interactive "P") + (let ((newval (if (null arg) (not abbrev-mode) + (> (prefix-numeric-value arg) 0)))) + (setq-default abbrev-mode newval) + (loop for buf being the buffers do + (if (not (eq (symbol-value-in-buffer 'abbrev-mode buf) newval)) + (with-current-buffer buf + (setq abbrev-mode newval))))) + (redraw-modeline)) + (defvar edit-abbrevs-map nil "Keymap used in edit-abbrevs.") @@ -423,11 +450,12 @@ (save-excursion (backward-word arg) (point)))))) (defun add-mode-abbrev (arg) - "Define mode-specific abbrev for last word(s) before point. -Argument is how many words before point form the expansion; -or zero means the region is the expansion. -A negative argument means to undefine the specified abbrev. -Reads the abbreviation in the minibuffer. + "Define mode-specific abbrev for region or last word(s) before point. +If region active, use it as the expansion\; otherwise, choose the word +before point. A prefix argument specifies the number of words before point +that form the expansion; or zero means the text between point and mark is +the expansion. A negative argument means to undefine the specified abbrev. +This command uses the minibuffer to read the abbreviation. Don't use this function in a Lisp program; use `define-abbrev' instead." ;; XEmacs change: @@ -437,19 +465,22 @@ global-abbrev-table (or local-abbrev-table (error "No per-mode abbrev table"))) - "Mode" arg)) + "Mode" arg) + (if defining-abbrev-turns-on-abbrev-mode (abbrev-mode 1))) (defun add-global-abbrev (arg) - "Define global (all modes) abbrev for last word(s) before point. -The prefix argument specifies the number of words before point that form the -expansion; or zero means the region is the expansion. -A negative argument means to undefine the specified abbrev. + "Define global (all modes) abbrev for region or last word(s) before point. +If region active, use it as the expansion\; otherwise, choose the word +before point. A prefix argument specifies the number of words before point +that form the expansion; or zero means the text between point and mark is +the expansion. A negative argument means to undefine the specified abbrev. This command uses the minibuffer to read the abbreviation. Don't use this function in a Lisp program; use `define-abbrev' instead." ;; XEmacs change: (interactive "P") - (add-abbrev global-abbrev-table "Global" arg)) + (add-abbrev global-abbrev-table "Global" arg) + (if defining-abbrev-turns-on-abbrev-mode (global-abbrev-mode 1))) (defun add-abbrev (table type arg) "Add an abbreviation to abbrev table TABLE. @@ -492,7 +523,8 @@ global-abbrev-table (or local-abbrev-table (error "No per-mode abbrev table"))) - "Mode" arg)) + "Mode" arg) + (if defining-abbrev-turns-on-abbrev-mode (abbrev-mode 1))) (defun inverse-add-global-abbrev (arg) "Define last word before point as a global (mode-independent) abbrev. @@ -500,7 +532,8 @@ This command uses the minibuffer to read the expansion. Expands the abbreviation after defining it." (interactive "p") - (inverse-add-abbrev global-abbrev-table "Global" arg)) + (inverse-add-abbrev global-abbrev-table "Global" arg) + (if defining-abbrev-turns-on-abbrev-mode (global-abbrev-mode 1))) (defun inverse-add-abbrev (table type arg) (let (name nameloc exp)