comparison lisp/subr.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 2b676dc88c66
children e7ee5f8bde58
comparison
equal deleted inserted replaced
813:9541922fb765 814:a634e3b7acc8
578 (while (and (< i len) (< idx string-len)) 578 (while (and (< i len) (< idx string-len))
579 (aset string idx (aref str i)) 579 (aset string idx (aref str i))
580 (setq idx (1+ idx) i (1+ i))) 580 (setq idx (1+ idx) i (1+ i)))
581 string)) 581 string))
582 582
583 ;; #### This function is not compatible with FSF in some cases. Hard 583 ;; From FSF 21.1
584 ;; to fix, because it is hard to trace the logic of the FSF function.
585 ;; In case we need the exact behavior, we can always copy the FSF
586 ;; version, which is very long and does lots of unnecessary stuff.
587 (defun truncate-string-to-width (str end-column &optional start-column padding) 584 (defun truncate-string-to-width (str end-column &optional start-column padding)
588 "Truncate string STR to end at column END-COLUMN. 585 "Truncate string STR to end at column END-COLUMN.
589 The optional 2nd arg START-COLUMN, if non-nil, specifies 586 The optional 3rd arg START-COLUMN, if non-nil, specifies
590 the starting column; that means to return the characters occupying 587 the starting column; that means to return the characters occupying
591 columns START-COLUMN ... END-COLUMN of STR. 588 columns START-COLUMN ... END-COLUMN of STR.
592 589
593 The optional 3rd arg PADDING, if non-nil, specifies a padding character 590 The optional 4th arg PADDING, if non-nil, specifies a padding character
594 to add at the end of the result if STR doesn't reach column END-COLUMN, 591 to add at the end of the result if STR doesn't reach column END-COLUMN,
595 or if END-COLUMN comes in the middle of a character in STR. 592 or if END-COLUMN comes in the middle of a character in STR.
596 PADDING is also added at the beginning of the result 593 PADDING is also added at the beginning of the result
597 if column START-COLUMN appears in the middle of a character in STR. 594 if column START-COLUMN appears in the middle of a character in STR.
598 595
599 If PADDING is nil, no padding is added in these cases, so 596 If PADDING is nil, no padding is added in these cases, so
600 the resulting string may be narrower than END-COLUMN." 597 the resulting string may be narrower than END-COLUMN."
601 (or start-column 598 (or start-column
602 (setq start-column 0)) 599 (setq start-column 0))
603 (let ((len (length str))) 600 (let ((len (length str))
604 (concat (substring str (min start-column len) (min end-column len)) 601 (idx 0)
605 (and padding (> end-column len) 602 (column 0)
606 (make-string (- end-column len) padding))))) 603 (head-padding "") (tail-padding "")
607 604 ch last-column last-idx from-idx)
605 (condition-case nil
606 (while (< column start-column)
607 (setq ch (aref str idx)
608 column (+ column (char-width ch))
609 idx (1+ idx)))
610 (args-out-of-range (setq idx len)))
611 (if (< column start-column)
612 (if padding (make-string end-column padding) "")
613 (if (and padding (> column start-column))
614 (setq head-padding (make-string (- column start-column) padding)))
615 (setq from-idx idx)
616 (if (< end-column column)
617 (setq idx from-idx)
618 (condition-case nil
619 (while (< column end-column)
620 (setq last-column column
621 last-idx idx
622 ch (aref str idx)
623 column (+ column (char-width ch))
624 idx (1+ idx)))
625 (args-out-of-range (setq idx len)))
626 (if (> column end-column)
627 (setq column last-column idx last-idx))
628 (if (and padding (< column end-column))
629 (setq tail-padding (make-string (- end-column column) padding))))
630 (setq str (substring str from-idx idx))
631 (if padding
632 (concat head-padding str tail-padding)
633 str))))
634
635 (defun truncate-string-with-continuation-dots (str end-column &optional
636 dots-str)
637 "Truncate string STR to end at column END-COLUMN, adding dots if needed.
638 The dots (normally `...', but can be controlled by DOTS-STR)' will be added
639 in such a way that the total string occupies no more than END-COLUMN
640 columns -- i.e. if the string goes past END-COLUMN, it will be truncated
641 somewhere short of END-COLUMN so that, with the dots added, the string
642 occupies END-COLUMN columns."
643 (if (<= (string-width str) end-column) str
644 (let* ((dots-str (or dots-str "..."))
645 (dotswidth (string-width dots-str)))
646 (concat (truncate-string-to-width str (- end-column dotswidth))
647 dots-str))))
608 648
609 649
610 ;; alist/plist functions 650 ;; alist/plist functions
611 (defun plist-to-alist (plist) 651 (defun plist-to-alist (plist)
612 "Convert property list PLIST into the equivalent association-list form. 652 "Convert property list PLIST into the equivalent association-list form.