comparison lisp/lisp-mode.el @ 872:79c6ff3eef26

[xemacs-hg @ 2002-06-20 21:18:01 by ben] font changes etc.; some 21.4 changes mule/mule-msw-init-late.el: Specify charset->windows-registry conversion. mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c. cl-macs.el: Document better. font-lock.el: Move Lisp function regexp to lisp-mode.el. lisp-mode.el: Various indentation fixes: Handle flet functions better. Handle argument lists in defuns and flets. Handle quoted lists, e.g. property lists -- don't indent like function calls. Distinguish between lambdas and other lists. lisp-mode.el: Handle this form. faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code: -- Fix lots of bogus code in msw-faces.el, msw-font-menu.el, font-menu.el that was "truenaming" font specs -- i.e. in the process of frobbing a particular field in a general user-specified font spec with wildcarded fields, sticking in particular values for all the remaining wildcarded fields. This bug was rampant everywhere except in x-faces.el (the oldest and only correctly written code). This also means that we need to work with font names at all times and not font instances, because a font instance is essentially a truenamed font. -- Total rewrite of extremely junky code in msw-faces.el. Work with names as well as font instances, and return names; stop truenaming when canonicalizing and frobbing; fix handling of the combined style field, i.e. weight/slant (also fixed in font.el). -- Totally rewrite the frobbing functions in faces.el. This time, we frob all the instantiators rather than just computing a single instance value and working backwards. That way, e.g., `bold' will work for all charsets that have bold available, rather than only for whatever charset was part of the computed font instance (another example of the truename virus). Also fix up code to look at the fallbacks (all of them) when no global value present, so we don't need to put something in the global value. Intelligently handle a request to frob a buffer locale, rather than signalling an error. When frobbing instantiators, try hard to figure out what device type is associated with them, and frob each according to its own proper device type. Correctly handle inheritance vectors given as instantiators. Preserve existing tags when putting back frobbed instantiators. Extract out general specifier-frobbing code into specifier.el. Document everything cleanly. Do lots of other things better, etc. -- Don't duplicatively set a global specification for the default font -- it's already in the fallback and we no longer need a default global specification present. Delete various code in x-faces.el and msw-faces.el that duplicated the lists of fonts in faces.c. -- init-global-faces was not being called at all under MS Windows! Major bogosity. That caused device-specific values to get stuck into all the fonts, making it very hard to change them -- setting global specs caused nothing to happen. -- Correct weight names in font.el. -- Lots more font fixups in objects*.c. Printer.el: Warning fix. specifier.el: Add more args to map-specifier. Add various "heuristic" specifier functions to aid in creation of specifier-munging code such as in faces.el. subr.el: New functions. lwlib.c: Fix warning. config.inc.samp: Clean up, add args to control fastcall (not yet supported! the changes needed are in another ws of mine), profile support, vc6 support, union-type. xemacs.dsp, xemacs.mak: Semi-major overhaul. Fix bug where dump-id was always getting recomputed, forcing a redump even when nothing changed. Add support for fastcall. Support edit-and-continue (on by default) with vc6. Use incremental linking when doing a debug compilation. Add support for profiling. Consolidate the various debug flags. Partial support for "batch-compiling" -- compiling many files on a single invocation of the compiler. Doesn't seem to help that much for me, so it's not finished or enabled by default. Remove HAVE_MSW_C_DIRED, we always do. Correct some sloppy use of directories. s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine HAVE_MMAP). s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32 variants (Cygwin, native, MinGW). Both of these are properly used in another ws. alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made: (1) Separation of various header files into an external and an internal version, similar to the existing separation of process.h and procimpl.h. Eventually this should be done for all Lisp objects. The external version has the same name as currently; the internal adds -impl. The external file has XFOO() macros for objects, but the structure is opaque and defined only in the internal file. It's now reasonable to move all prototypes in lisp.h into the appropriate external file, and this should be done. Currently, separation has been done on extents.h, objects*.h, console.h, device.h, frame.h, and window.h. For c/d/f/w, the most basic properties are available in the external header file, with the macros resolving to functions. In the internal header file, the macros are redefined to directly access the structure. Also, the global MARK_FOO_CHANGED macros have been made into functions so that they can be accessed without needing to include lots of -impl headers -- they are used in almost exclusively in non-time-critical functions, and take up enough time that the function overhead will be negligible. Similarly, the function overhead from making the basic properties mentioned above into functions is negligible, and code that does heavy accessing of c/d/f/w structures inevitably ends up needing the internal header files, anyway. (2) More face changes. -- Major rewrite of objects-msw.c. Now handles wildcard specs properly, rather than "truenaming" (or even worse, signalling an error, which previously happened with some of the fallbacks if you tried to use them in make-font-instance!). -- Split charset matching of fonts into two stages -- one to find a font specifically designed for a particular charset (by examining its registry), the second to find a Unicode font that can support the charset. This needs to proceed as two complete, separate instantiations in order to work properly (otherwise many of the fonts in the HELLO page look wrong). This should also make it easy to support iso10646 (Unicode) fonts under X. -- All default values for fonts are now completely specified in the fallbacks. Stuff from mule-x-init.el has all been moved here, merged with the existing specs, and totally rethought so you get sensible results. (HELLO now looks much better!). -- Generalize the "default X/GTK device" stuff into a per-device-type "default device". -- Add mswindows-{set-}charset-registry. In time, charset<->code-page conversion functions will be removed. -- Wrap protective code around calls to compute device specifier tags, and do this computation before calling the face initialization code because the latter may need these tags to be correctly updated. (3) Other changes. EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes. config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of #ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside! eval.c: Let detailed backtraces be detailed. specifier.c: Don't override user's print-string-length/print-length settings. glyphs.c: New function image-instance-instantiator. config.h.in, sysdep.c: Changes for fastcall. sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP NEEDS TO GO IN, TOO. search.c: Fix *evil* crash due to incorrect synching of syntax-cache code with 21.1. THIS SHOULD GO INTO 21.4.
author ben
date Thu, 20 Jun 2002 21:19:10 +0000
parents 047d37eb70d7
children 1b0339b048ce
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
673 (goto-char containing-sexp) 673 (goto-char containing-sexp)
674 (+ normal-indent lisp-indent-offset)) 674 (+ normal-indent lisp-indent-offset))
675 (t 675 (t
676 normal-indent)))))) 676 normal-indent))))))
677 677
678 (defvar lisp-function-and-type-regexp
679 (concat "def\\("
680 ;; def but not define-.
681 "\\(un\\|advice\\|alias\\|macro\\*?\\|setf\\|subst\\*?\\|"
682 "-edebug-spec\\|"
683 ;; CLOS
684 "method\\|generic\\|"
685 ;; define-*
686 "ine-\\(?:"
687 ;; basic Lisp stuff
688 "compiler-macro\\|function\\|function-when-void\\|modify-macro\\|"
689 "setf-method\\|"
690 ;; obsolete/compatible support, XEmacs-specific
691 "compatible-function-alias\\|obsolete-function-alias\\|"
692 ;; XEmacs-specific, supporting stuff inside of XEmacs
693 "ccl-program\\|device-method\\*?\\|prefix-command\\|skeleton"
694 "\\)\\)\\|"
695 ;; Structure declarations.
696 "\\(class\\|struct\\|type\\)\\)\\>")
697 "Regular expression to match the function and type keywords used in Lisp.
698 This matches, for example, the string \"defun\", as well as defsetf,
699 defsubst*, define-prefix-command, etc. Match string 1 matches everything
700 but the three-letter \"def\" string at the beginning. Match string 2
701 matches everything after that, when it's *NOT* a \"type\" declaration --
702 which includes defclass, defstruct, and deftype. Match string 3 is similar
703 to match string 2 in that it matches everything after the \"def\", when
704 \(and only when) the keyword matched *IS* a type declaration. You can use
705 match strings 2 and 3 to easily determine whether a function or type was
706 matched. The regex is terminated with a \\\> so that there must be a
707 word-end; i.e. defunbbb won't match.")
708
709 (defvar lisp-flet-regexp
710 "(\\(flet\\|macrolet\\|labels\\)\\(\\s-\\|\n\\)")
711
678 (defun lisp-indent-function (indent-point state) 712 (defun lisp-indent-function (indent-point state)
679 ;; free reference to `calculate-lisp-indent-last-sexp' 713 ;; free reference to `calculate-lisp-indent-last-sexp'
680 ;; in #'calculate-lisp-indent 714 ;; in #'calculate-lisp-indent
681 (let ((normal-indent (current-column))) 715 (let ((normal-indent (current-column)))
682 (goto-char (1+ (elt state 1))) 716 (goto-char (1+ (elt state 1)))
695 ;; line as calculate-lisp-indent-last-sexp. Note that first 729 ;; line as calculate-lisp-indent-last-sexp. Note that first
696 ;; thing on that line has to be complete sexp since we are 730 ;; thing on that line has to be complete sexp since we are
697 ;; inside the innermost containing sexp. 731 ;; inside the innermost containing sexp.
698 (backward-prefix-chars) 732 (backward-prefix-chars)
699 (current-column)) 733 (current-column))
700 (let ((function (buffer-substring (point) 734
735 ;; Now come a bunch of ad-hoc checks to see if we're in particular
736 ;; places (defining an flet function, in the argument list of a
737 ;; regular or flet function, in a quoted list, etc.) where the
738 ;; regular indenting doesn't work well.
739
740 ;; #### All this stuff here should be generalized so that
741 ;; you can specify, for various functions, how you want
742 ;; particular arguments handled -- in some way that works
743 ;; recursively, so it can handle flet and such.
744
745 (let* ((function (buffer-substring (point)
701 (progn (forward-sexp 1) (point)))) 746 (progn (forward-sexp 1) (point))))
702 method) 747 (quote (condition-case nil
703 (if (condition-case nil 748 (save-excursion
749 (backward-up-list 1)
750 (memq (char-before (point)) '(?' ?`)))))
751 method)
752 (cond
753 ;; if we're indenting a quoted list, and the first word is not
754 ;; lambda, line up second line below first with no indentation,
755 ;; so that property lists indent correctly.
756 ((and quote (not (equal function "lambda")))
757 (setq method 'lisp-indent-quoteform))
758 ;; do the same if we're indenting the arg list of a def* form.
759 ((let ((p (point)))
760 (condition-case nil
704 (save-excursion 761 (save-excursion
705 (backward-up-list 1) 762 (backward-up-list 2)
706 (backward-up-list 1) 763 ;; make sure we're indeed the second argument of the
707 (backward-up-list 1) 764 ;; def* form.
708 (looking-at "(\\(flet\\|macrolet\\|labels\\)\\s-")) 765 (and (eq (point) (save-excursion
709 (error nil)) 766 (goto-char p)
710 (setq method 'defun) 767 (backward-up-list 1)
711 (setq method (or (get (intern-soft function) 'lisp-indent-function) 768 (backward-sexp 2)
712 (get (intern-soft function) 'lisp-indent-hook)))) 769 (1- (point))))
770 ;; check to see that the function is a def* type
771 (eq (char-after) ?\()
772 (progn (forward-char 1) t)
773 (looking-at lisp-function-and-type-regexp)
774 ;; defstruct may have slot option specs, which
775 ;; should probably be reverse-indented like
776 ;; normal, because the slot name is the first
777 ;; in the list. #### Review this.
778 (not (equal (match-string 0) "defstruct"))))
779 (error nil)))
780 (setq method 'lisp-indent-quoteform))
781
782 ;; handle functions in flet forms
783 ((let ((p (point)))
784 (condition-case nil
785 (save-excursion
786 (backward-up-list 3)
787 ;; make sure we're indeed a function, i.e. inside the
788 ;; first form after the flet.
789 (and (eq (point) (save-excursion
790 (goto-char p)
791 (backward-up-list 2)
792 (backward-sexp 1)
793 (1- (point))))
794 (looking-at lisp-flet-regexp)))
795 (error nil)))
796 (setq method 'defun))
797
798 ;; handle the arg lists in functions in flet forms
799 ((let ((p (point)))
800 (condition-case nil
801 (save-excursion
802 (backward-up-list 2)
803 ;; make sure we're indeed the arg list -- i.e. the first
804 ;; element after the function name.
805 (and (eq (point) (save-excursion
806 (goto-char p)
807 (backward-up-list 1)
808 (backward-sexp 1)
809 (1- (point))))
810 (progn
811 (backward-up-list 2)
812 (looking-at lisp-flet-regexp))))
813 (error nil)))
814 (setq method 'lisp-indent-quoteform))
815 (t
816 (setq method
817 (or (get (intern-soft function) 'lisp-indent-function)
818 (get (intern-soft function) 'lisp-indent-hook)))))
713 (cond ((or (eq method 'defun) 819 (cond ((or (eq method 'defun)
714 (and (null method) 820 (and (null method)
715 (> (length function) 3) 821 (> (length function) 3)
716 (string-match "\\`def" function))) 822 (string-match "\\`def" function)))
717 (lisp-indent-defform state indent-point)) 823 (lisp-indent-defform state indent-point))
718 ((integerp method) 824 ((integerp method)
719 (lisp-indent-specform method state 825 (lisp-indent-specform method state
720 indent-point normal-indent)) 826 indent-point normal-indent))
721 (method 827 (method
722 (funcall method state indent-point))))))) 828 (funcall method state indent-point)))))))
829
830 (defun lisp-indent-quoteform (state indent-point)
831 (goto-char (car (cdr state)))
832 (forward-line 1)
833 (if (> (point) (car (cdr (cdr state))))
834 (progn
835 (goto-char (car (cdr state)))
836 (+ 1 (current-column)))))
723 837
724 (defvar lisp-body-indent 2 838 (defvar lisp-body-indent 2
725 "Number of columns to indent the second line of a `(def...)' form.") 839 "Number of columns to indent the second line of a `(def...)' form.")
726 840
727 (defun lisp-indent-specform (count state indent-point normal-indent) 841 (defun lisp-indent-specform (count state indent-point normal-indent)
794 (put 'save-window-excursion 'lisp-indent-function 0) 908 (put 'save-window-excursion 'lisp-indent-function 0)
795 (put 'save-selected-window 'lisp-indent-function 0) 909 (put 'save-selected-window 'lisp-indent-function 0)
796 (put 'with-selected-window 'lisp-indent-function 1) 910 (put 'with-selected-window 'lisp-indent-function 1)
797 (put 'save-selected-frame 'lisp-indent-function 0) 911 (put 'save-selected-frame 'lisp-indent-function 0)
798 (put 'with-selected-frame 'lisp-indent-function 1) 912 (put 'with-selected-frame 'lisp-indent-function 1)
913 (put 'save-selected-device 'lisp-indent-function 0)
914 (put 'with-selected-device 'lisp-indent-function 1)
799 (put 'save-restriction 'lisp-indent-function 0) 915 (put 'save-restriction 'lisp-indent-function 0)
800 (put 'save-match-data 'lisp-indent-function 0) 916 (put 'save-match-data 'lisp-indent-function 0)
801 (put 'let 'lisp-indent-function 1) 917 (put 'let 'lisp-indent-function 1)
802 (put 'let* 'lisp-indent-function 1) 918 (put 'let* 'lisp-indent-function 1)
803 (put 'let-specifier 'lisp-indent-function 1) 919 (put 'let-specifier 'lisp-indent-function 1)