comparison lisp/lisp-mode.el @ 776:79940b592197

[xemacs-hg @ 2002-03-15 07:43:14 by ben] .cvsignore: ignore .tmp files that are getting auto-created by VC. Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). alloc.c, emacs.c, lisp.h: add new -no-packages. make sure list of args for sorting is actually correct. clean up arg parsing code. xemacs.mak: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). Makefile: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). mule\chinese.el, mule\japan-util.el: fix warnings. behavior-defs.el: fix errors with require. bytecomp-runtime.el: add new funs {when,and}-{f}boundp, clean up docs. cus-edit.el: pretty-print values. dump-paths.el, find-paths.el, startup.el, setup-paths.el: fix problems/inconsistencies parsing options. support new -no-packages option. merge code duplication in dump-paths and startup. lisp-mode.el: indent macrolet and labels correctly. update comments about lisp-indent-function. flet already handled in cl. apropos.el, auto-save.el, buff-menu.el, cl-extra.el, dragdrop.el, faces.el, files.el, fill.el, font-lock.el, font.el, gtk-faces.el, gui.el, help.el, hyper-apropos.el, info.el, isearch-mode.el, keymap.el, lisp-mnt.el, mouse.el, package-admin.el, package-get.el, printer.el, process.el, resize-minibuffer.el, simple.el, toolbar-items.el, wid-edit.el, win32-native.el: fix warnings. very-early-lisp.el: update docs. mule\chinese.el, mule\japan-util.el: fix warnings. mule\chinese.el, mule\japan-util.el: fix warnings. behavior-defs.el: fix errors with require. bytecomp-runtime.el: add new funs {when,and}-{f}boundp, clean up docs. cus-edit.el: pretty-print values. dump-paths.el, find-paths.el, startup.el, setup-paths.el: fix problems/inconsistencies parsing options. support new -no-packages option. merge code duplication in dump-paths and startup. lisp-mode.el: indent macrolet and labels correctly. update comments about lisp-indent-function. flet already handled in cl. apropos.el, auto-save.el, buff-menu.el, cl-extra.el, dragdrop.el, faces.el, files.el, fill.el, font-lock.el, font.el, gtk-faces.el, gui.el, help.el, hyper-apropos.el, info.el, isearch-mode.el, keymap.el, lisp-mnt.el, mouse.el, package-admin.el, package-get.el, printer.el, process.el, resize-minibuffer.el, simple.el, toolbar-items.el, wid-edit.el, win32-native.el: fix warnings. very-early-lisp.el: update docs. mule\chinese.el, mule\japan-util.el: fix warnings. Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs).
author ben
date Fri, 15 Mar 2002 07:43:43 +0000
parents 943eaba38521
children a5954632b187
comparison
equal deleted inserted replaced
775:7d972c3de90a 776:79940b592197
698 (if (condition-case nil 698 (if (condition-case nil
699 (save-excursion 699 (save-excursion
700 (backward-up-list 1) 700 (backward-up-list 1)
701 (backward-up-list 1) 701 (backward-up-list 1)
702 (backward-up-list 1) 702 (backward-up-list 1)
703 (looking-at "(flet\\s-")) 703 (looking-at "(\\(flet\\|macrolet\\|labels\\)\\s-"))
704 (error nil)) 704 (error nil))
705 (setq method 'defun) 705 (setq method 'defun)
706 (setq method (or (get (intern-soft function) 'lisp-indent-function) 706 (setq method (or (get (intern-soft function) 'lisp-indent-function)
707 (get (intern-soft function) 'lisp-indent-hook)))) 707 (get (intern-soft function) 'lisp-indent-hook))))
708 (cond ((or (eq method 'defun) 708 (cond ((or (eq method 'defun)
775 775
776 ;; (put 'progn 'lisp-indent-function 0), say, causes progn to be indented 776 ;; (put 'progn 'lisp-indent-function 0), say, causes progn to be indented
777 ;; like defun if the first form is placed on the next line, otherwise 777 ;; like defun if the first form is placed on the next line, otherwise
778 ;; it is indented like any other form (i.e. forms line up under first). 778 ;; it is indented like any other form (i.e. forms line up under first).
779 779
780 ;; NOTE: All def* functions are handled specially, no need to put them here.
781 ;; NOTE: All cl-* constructs are handled in cl.el.
782
780 (put 'lambda 'lisp-indent-function 'defun) 783 (put 'lambda 'lisp-indent-function 'defun)
781 (put 'autoload 'lisp-indent-function 'defun) 784 (put 'autoload 'lisp-indent-function 'defun)
782 (put 'progn 'lisp-indent-function 0) 785 (put 'progn 'lisp-indent-function 0)
783 (put 'prog1 'lisp-indent-function 1) 786 (put 'prog1 'lisp-indent-function 1)
784 (put 'prog2 'lisp-indent-function 2) 787 (put 'prog2 'lisp-indent-function 2)
791 (put 'save-restriction 'lisp-indent-function 0) 794 (put 'save-restriction 'lisp-indent-function 0)
792 (put 'save-match-data 'lisp-indent-function 0) 795 (put 'save-match-data 'lisp-indent-function 0)
793 (put 'let 'lisp-indent-function 1) 796 (put 'let 'lisp-indent-function 1)
794 (put 'let* 'lisp-indent-function 1) 797 (put 'let* 'lisp-indent-function 1)
795 (put 'let-specifier 'lisp-indent-function 1) 798 (put 'let-specifier 'lisp-indent-function 1)
796 (put 'flet 'lisp-indent-function 1)
797 (put 'while 'lisp-indent-function 1) 799 (put 'while 'lisp-indent-function 1)
798 (put 'if 'lisp-indent-function 2) 800 (put 'if 'lisp-indent-function 2)
799 (put 'catch 'lisp-indent-function 1) 801 (put 'catch 'lisp-indent-function 1)
800 (put 'condition-case 'lisp-indent-function 2) 802 (put 'condition-case 'lisp-indent-function 2)
801 (put 'handler-case 'lisp-indent-function 1) 803 (put 'handler-case 'lisp-indent-function 1)