Mercurial > hg > xemacs-beta
annotate lisp/indent.el @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 5b560b7374ff |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; indent.el --- indentation commands for XEmacs |
| 2 | |
| 3 ;; Copyright (C) 1985, 1992, 1993, 1995, 1997 Free Software Foundation, Inc. | |
| 814 | 4 ;; Copyright (C) 2002 Ben Wing. |
| 428 | 5 |
| 6 ;; Maintainer: FSF | |
| 7 ;; Keywords: lisp, languages, tools, dumped | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 12 ;; under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 ;; General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 23 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 24 ;; 02111-1307, USA. | |
| 25 | |
| 26 ;;; Synched up with: FSF 19.30. | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs. | |
| 31 | |
| 32 ;; Commands for making and changing indentation in text. These are | |
| 33 ;; described in the XEmacs Reference Manual. | |
| 34 | |
| 35 ;; 06/11/1997 - Convert (preceding|following)-char to char-(before|after) -slb | |
| 36 | |
| 37 ;;; Code: | |
| 38 | |
| 39 (defvar standard-indent 4 "\ | |
| 40 Default number of columns for margin-changing functions to indent.") | |
| 41 | |
| 42 (defvar indent-line-function 'indent-to-left-margin | |
| 43 "Function to indent current line.") | |
| 44 | |
| 45 (defun indent-according-to-mode () | |
| 46 "Indent line in proper way for current major mode." | |
| 47 (interactive) | |
| 48 (funcall indent-line-function)) | |
| 49 | |
| 50 (defun indent-for-tab-command (&optional prefix-arg) | |
| 51 "Indent line in proper way for current major mode." | |
| 52 (interactive "P") | |
| 53 (if (eq indent-line-function 'indent-to-left-margin) | |
| 54 (insert-tab prefix-arg) | |
| 55 (if prefix-arg | |
| 56 (funcall indent-line-function prefix-arg) | |
| 57 (funcall indent-line-function)))) | |
| 58 | |
| 59 (defun insert-tab (&optional prefix-arg) | |
| 60 (let ((count (prefix-numeric-value prefix-arg))) | |
| 61 (if abbrev-mode | |
| 62 (expand-abbrev)) | |
| 63 (if indent-tabs-mode | |
| 64 (insert-char ?\t count) | |
| 65 ;; XEmacs: (Need the `1+') | |
| 66 (indent-to (* tab-width (1+ (/ (current-column) tab-width))))))) | |
| 67 | |
| 444 | 68 (defun indent-rigidly (start end count) |
| 69 "Indent all lines starting in the region sideways by COUNT columns. | |
| 70 Called from a program, takes three arguments, START, END and COUNT." | |
| 428 | 71 (interactive "r\np") |
| 72 (save-excursion | |
| 73 (goto-char end) | |
| 74 (setq end (point-marker)) | |
| 75 (goto-char start) | |
| 76 (or (bolp) (forward-line 1)) | |
| 77 (while (< (point) end) | |
| 78 (let ((indent (current-indentation)) | |
| 79 eol-flag) | |
| 80 (save-excursion | |
| 81 (skip-chars-forward " \t") | |
| 82 (setq eol-flag (eolp))) | |
| 83 (or eol-flag | |
| 444 | 84 (indent-to (max 0 (+ indent count)) 0)) |
| 428 | 85 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) |
| 86 (forward-line 1)) | |
| 87 (move-marker end nil) | |
| 88 (setq zmacs-region-stays nil))) ; XEmacs | |
| 89 | |
| 90 (defun indent-line-to (column) | |
| 91 "Indent current line to COLUMN. | |
| 92 This function removes or adds spaces and tabs at beginning of line | |
| 93 only if necessary. It leaves point at end of indentation." | |
| 94 (back-to-indentation) | |
| 95 (let ((cur-col (current-column))) | |
| 96 (cond ((< cur-col column) | |
| 97 (if (>= (- column (* (/ cur-col tab-width) tab-width)) tab-width) | |
| 98 (delete-region (point) | |
| 99 (progn (skip-chars-backward " ") (point)))) | |
| 100 (indent-to column)) | |
| 101 ((> cur-col column) ; too far right (after tab?) | |
| 102 (delete-region (progn (move-to-column column t) (point)) | |
| 103 (progn (back-to-indentation) (point))))))) | |
| 104 | |
| 105 (defun current-left-margin () | |
| 106 "Return the left margin to use for this line. | |
| 107 This is the value of the buffer-local variable `left-margin' plus the value | |
| 108 of the `left-margin' text-property at the start of the line." | |
| 109 (save-excursion | |
| 110 (back-to-indentation) | |
| 111 (max 0 | |
| 112 (+ left-margin (or (get-text-property | |
| 113 (if (and (eobp) (not (bobp))) | |
| 114 (1- (point)) (point)) | |
| 115 'left-margin) 0))))) | |
| 116 | |
| 117 (defun move-to-left-margin (&optional n force) | |
| 118 "Move to the left margin of the current line. | |
| 119 With optional argument, move forward N-1 lines first. | |
| 120 The column moved to is the one given by the `current-left-margin' function. | |
| 121 If the line's indentation appears to be wrong, and this command is called | |
| 122 interactively or with optional argument FORCE, it will be fixed." | |
| 123 (interactive (list (prefix-numeric-value current-prefix-arg) t)) | |
| 124 (beginning-of-line n) | |
| 125 (skip-chars-forward " \t") | |
| 126 (let ((lm (current-left-margin)) | |
| 127 (cc (current-column))) | |
| 128 (cond ((> cc lm) | |
| 129 (if (> (move-to-column lm force) lm) | |
| 130 ;; If lm is in a tab and we are not forcing, move before tab | |
| 131 (backward-char 1))) | |
| 132 ((and force (< cc lm)) | |
| 133 (indent-to-left-margin))))) | |
| 134 | |
| 135 ;; This is the default indent-line-function, | |
| 136 ;; used in Fundamental Mode, Text Mode, etc. | |
| 137 (defun indent-to-left-margin () | |
| 138 "Indent current line to the column given by `current-left-margin'." | |
| 139 (indent-line-to (current-left-margin))) | |
| 140 | |
| 141 (defun delete-to-left-margin (&optional from to) | |
| 142 "Remove left margin indentation from a region. | |
| 444 | 143 The amount of indentation to delete is determined by calling the |
| 144 function `current-left-margin'. | |
| 428 | 145 In no case will it delete non-whitespace. |
| 146 Args FROM and TO are optional; default is the whole buffer." | |
| 147 (save-excursion | |
| 148 (goto-char (or to (point-max))) | |
| 149 (setq to (point-marker)) | |
| 150 (goto-char (or from (point-min))) | |
| 151 (or (bolp) (forward-line 1)) | |
| 152 (while (< (point) to) | |
| 153 (delete-region (point) (progn (move-to-left-margin nil t) (point))) | |
| 154 (forward-line 1)) | |
| 155 (move-marker to nil))) | |
| 156 | |
| 157 (defun set-left-margin (from to lm) | |
| 158 "Set the left margin of the region to WIDTH. | |
| 159 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 160 (interactive "r\nNSet left margin to column: ") | |
| 161 (if (interactive-p) (setq lm (prefix-numeric-value lm))) | |
| 162 (save-excursion | |
| 163 ;; If inside indentation, start from BOL. | |
| 164 (goto-char from) | |
| 165 (skip-chars-backward " \t") | |
| 166 (if (bolp) (setq from (point))) | |
| 167 ;; Place end after whitespace | |
| 168 (goto-char to) | |
| 169 (skip-chars-forward " \t") | |
| 170 (setq to (point-marker))) | |
| 171 ;; Delete margin indentation first, but keep paragraph indentation. | |
| 172 (delete-to-left-margin from to) | |
| 173 (put-text-property from to 'left-margin lm) | |
| 174 (indent-rigidly from to lm) | |
| 175 (if auto-fill-function (save-excursion (fill-region from to nil t t))) | |
| 176 (move-marker to nil)) | |
| 177 | |
| 178 (defun set-right-margin (from to lm) | |
| 179 "Set the right margin of the region to WIDTH. | |
| 180 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 181 (interactive "r\nNSet right margin to width: ") | |
| 182 (if (interactive-p) (setq lm (prefix-numeric-value lm))) | |
| 183 (save-excursion | |
| 184 (goto-char from) | |
| 185 (skip-chars-backward " \t") | |
| 186 (if (bolp) (setq from (point)))) | |
| 187 (put-text-property from to 'right-margin lm) | |
| 188 (if auto-fill-function (save-excursion (fill-region from to nil t t)))) | |
| 189 | |
| 190 (defun alter-text-property (from to prop func &optional object) | |
| 191 "Programmatically change value of a text-property. | |
| 192 For each region between FROM and TO that has a single value for PROPERTY, | |
| 193 apply FUNCTION to that value and sets the property to the function's result. | |
| 194 Optional fifth argument OBJECT specifies the string or buffer to operate on." | |
| 195 (let ((begin from) | |
| 196 end val) | |
| 197 (while (setq val (get-text-property begin prop object) | |
| 198 end (text-property-not-all begin to prop val object)) | |
| 199 (put-text-property begin end prop (funcall func val) object) | |
| 200 (setq begin end)) | |
| 201 (if (< begin to) | |
| 202 (put-text-property begin to prop (funcall func val) object)))) | |
| 203 | |
| 204 (defun increase-left-margin (from to inc) | |
| 205 "Increase or decrease the left-margin of the region. | |
| 206 With no prefix argument, this adds `standard-indent' of indentation. | |
| 207 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 208 to change the margin by, in characters. | |
| 209 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 210 (interactive "*r\nP") | |
| 211 (setq inc (if inc (prefix-numeric-value inc) standard-indent)) | |
| 212 (save-excursion | |
| 213 (goto-char from) | |
| 214 (skip-chars-backward " \t") | |
| 215 (if (bolp) (setq from (point))) | |
| 216 (goto-char to) | |
| 217 (setq to (point-marker))) | |
| 218 (alter-text-property from (marker-position to) 'left-margin ; XEmacs | |
| 219 (lambda (v) (max (- left-margin) (+ inc (or v 0))))) | |
| 220 (indent-rigidly from (marker-position to) inc) ; XEmacs | |
| 221 (if auto-fill-function | |
| 222 (save-excursion | |
| 223 (fill-region from (marker-position to) nil t t))) ; XEmacs | |
| 224 (move-marker to nil)) | |
| 225 | |
| 226 (defun decrease-left-margin (from to inc) | |
| 227 "Make the left margin of the region smaller. | |
| 228 With no prefix argument, decrease the indentation by `standard-indent'. | |
| 229 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 230 to change the margin by, in characters. | |
| 231 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 232 (interactive "*r\nP") | |
| 233 (setq inc (if inc (prefix-numeric-value inc) standard-indent)) | |
| 234 (increase-left-margin from to (- inc))) | |
| 235 | |
| 236 (defun increase-right-margin (from to inc) | |
| 237 "Increase the right-margin of the region. | |
| 238 With no prefix argument, increase the right margin by `standard-indent'. | |
| 239 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 240 to change the margin by, in characters. A negative argument decreases | |
| 241 the right margin width. | |
| 242 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 243 (interactive "r\nP") | |
| 244 (if (interactive-p) | |
| 245 (setq inc (if inc (prefix-numeric-value current-prefix-arg) | |
| 246 standard-indent))) | |
| 247 (save-excursion | |
| 248 (alter-text-property from to 'right-margin | |
| 249 (lambda (v) (+ inc (or v 0)))) | |
| 250 (if auto-fill-function | |
| 251 (fill-region from to nil t t)))) | |
| 252 | |
| 253 (defun decrease-right-margin (from to inc) | |
| 254 "Make the right margin of the region smaller. | |
| 255 With no prefix argument, decrease the right margin by `standard-indent'. | |
| 256 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 257 of width to remove, in characters. A negative argument increases | |
| 258 the right margin width. | |
| 259 If `auto-fill-mode' is active, re-fills region to fit in new margin." | |
| 260 (interactive "*r\nP") | |
| 261 (setq inc (if inc (prefix-numeric-value inc) standard-indent)) | |
| 262 (increase-right-margin from to (- inc))) | |
| 263 | |
| 264 (defun beginning-of-line-text (&optional n) | |
| 265 "Move to the beginning of the text on this line. | |
| 266 With optional argument, move forward N-1 lines first. | |
| 267 From the beginning of the line, moves past the left-margin indentation, the | |
| 268 fill-prefix, and any indentation used for centering or right-justifying the | |
| 444 | 269 line, but does not move past any whitespace that was explicitly inserted |
| 428 | 270 \(such as a tab used to indent the first line of a paragraph)." |
| 271 (interactive "p") | |
| 272 (beginning-of-line n) | |
| 273 (skip-chars-forward " \t") | |
| 274 ;; Skip over fill-prefix. | |
| 444 | 275 (if (and fill-prefix |
| 428 | 276 (not (string-equal fill-prefix ""))) |
| 277 (if (equal fill-prefix | |
| 444 | 278 (buffer-substring |
| 428 | 279 (point) (min (point-max) (+ (length fill-prefix) (point))))) |
| 280 (forward-char (length fill-prefix))) | |
| 281 (if (and adaptive-fill-mode adaptive-fill-regexp | |
| 282 (looking-at adaptive-fill-regexp)) | |
| 283 (goto-char (match-end 0)))) | |
| 284 ;; Skip centering or flushright indentation | |
| 285 (if (memq (current-justification) '(center right)) | |
| 286 (skip-chars-forward " \t"))) | |
| 287 | |
| 288 (defvar indent-region-function nil | |
| 289 "Short cut function to indent region using `indent-according-to-mode'. | |
| 290 A value of nil means really run `indent-according-to-mode' on each line.") | |
| 291 | |
|
4812
5b560b7374ff
Make COLUMN optional in #'indent-region, as in GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
814
diff
changeset
|
292 (defun indent-region (start end &optional column) |
| 428 | 293 "Indent each nonblank line in the region. |
| 294 With no argument, indent each line using `indent-according-to-mode', | |
| 295 or use `indent-region-function' to do the whole region if that's non-nil. | |
| 296 If there is a fill prefix, make each line start with the fill prefix. | |
| 297 With argument COLUMN, indent each line to that column. | |
| 298 Called from a program, takes three args: START, END and COLUMN." | |
| 299 (interactive "r\nP") | |
| 300 (if (null column) | |
| 301 (if fill-prefix | |
| 302 (save-excursion | |
| 303 (goto-char end) | |
| 304 (setq end (point-marker)) | |
| 305 (goto-char start) | |
| 306 (let ((regexp (regexp-quote fill-prefix))) | |
| 307 (while (< (point) end) | |
| 308 (or (looking-at regexp) | |
| 309 (and (bolp) (eolp)) | |
| 310 (insert fill-prefix)) | |
| 311 (forward-line 1)))) | |
| 312 (if indent-region-function | |
| 313 (funcall indent-region-function start end) | |
| 314 (save-excursion | |
| 315 (goto-char end) | |
| 316 (setq end (point-marker)) | |
| 317 (goto-char start) | |
| 318 (or (bolp) (forward-line 1)) | |
| 319 (while (< (point) end) | |
| 320 (or (and (bolp) (eolp)) | |
| 321 (funcall indent-line-function)) | |
| 322 (forward-line 1)) | |
| 323 (move-marker end nil)))) | |
| 324 (setq column (prefix-numeric-value column)) | |
| 325 (save-excursion | |
| 326 (goto-char end) | |
| 327 (setq end (point-marker)) | |
| 328 (goto-char start) | |
| 329 (or (bolp) (forward-line 1)) | |
| 330 (while (< (point) end) | |
| 331 (delete-region (point) (progn (skip-chars-forward " \t") (point))) | |
| 332 (or (eolp) | |
| 333 (indent-to column 0)) | |
| 334 (forward-line 1)) | |
| 335 (move-marker end nil)))) | |
| 336 | |
| 814 | 337 (defvar indent-balanced-expression-function nil |
| 338 "Short cut function to indent balanced expression. | |
| 339 A value of nil means really run `indent-according-to-mode' on each line of | |
| 340 balanced expression as computed with `forward-sexp'.") | |
| 341 | |
| 342 (defun indent-balanced-expression () | |
| 343 "Indent each nonblank line in the balanced expression at point. | |
| 344 Use `indent-balanced-expression-function' if that's non-nil, or find | |
| 345 expression with `forward-sexp' and use `indent-region' on result." | |
| 346 (interactive "") | |
| 347 (let ((fun (or indent-balanced-expression-function | |
| 348 (cond ((memq major-mode '(c-mode c++-mode java-mode objc-mode | |
| 349 idl-mode pike-mode | |
| 350 c++-c-mode elec-c-mode)) | |
| 351 'c-indent-exp) | |
| 352 ((memq major-mode | |
| 353 '(lisp-mode | |
| 354 emacs-lisp-mode lisp-interaction-mode | |
| 355 scheme-mode inferior-scheme-mode | |
| 356 scheme-interaction-mode)) | |
| 357 'indent-sexp))))) | |
| 358 (if fun (funcall fun) | |
| 359 (let ((end (save-excursion (forward-sexp) (point)))) | |
| 360 (indent-region (point) end nil))))) | |
| 361 | |
| 362 (defun indent-region-or-balanced-expression () | |
| 363 "Indent region if active, or balanced expression at point. | |
| 364 See `indent-region' and `indent-balanced-expression'." | |
| 365 (interactive "") | |
| 366 (if (region-active-p) | |
| 367 (indent-region (region-beginning) (region-end) nil) | |
| 368 (indent-balanced-expression))) | |
| 369 | |
| 428 | 370 (defun indent-relative-maybe () |
| 371 "Indent a new line like previous nonblank line." | |
| 372 (interactive) | |
| 373 (indent-relative t)) | |
| 374 | |
| 375 (defun indent-relative (&optional unindented-ok) | |
| 376 "Space out to under next indent point in previous nonblank line. | |
| 377 An indent point is a non-whitespace character following whitespace. | |
| 378 If the previous nonblank line has no indent points beyond the | |
| 379 column point starts at, `tab-to-tab-stop' is done instead." | |
| 380 (interactive "P") | |
| 381 (if abbrev-mode (expand-abbrev)) | |
| 382 (let ((start-column (current-column)) | |
| 383 indent) | |
| 384 (save-excursion | |
| 385 (beginning-of-line) | |
| 386 (if (re-search-backward "^[^\n]" nil t) | |
| 387 (let ((end (save-excursion (forward-line 1) (point)))) | |
| 388 (move-to-column start-column) | |
| 389 ;; Is start-column inside a tab on this line? | |
| 390 (if (> (current-column) start-column) | |
| 391 (backward-char 1)) | |
| 392 (or (looking-at "[ \t]") | |
| 393 unindented-ok | |
| 394 (skip-chars-forward "^ \t" end)) | |
| 395 (skip-chars-forward " \t" end) | |
| 396 (or (= (point) end) (setq indent (current-column)))))) | |
| 397 (if indent | |
| 398 (let ((opoint (point-marker))) | |
| 399 (delete-region (point) (progn (skip-chars-backward " \t") (point))) | |
| 400 (indent-to indent 0) | |
| 401 (if (> opoint (point)) | |
| 402 (goto-char opoint)) | |
| 403 (move-marker opoint nil)) | |
| 404 (tab-to-tab-stop)))) | |
| 405 | |
| 406 (defvar tab-stop-list | |
| 407 '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120) | |
| 408 "*List of tab stop positions used by `tab-to-tab-stops'. | |
| 409 This should be a list of integers, ordered from smallest to largest.") | |
| 410 | |
| 411 (defvar edit-tab-stops-map nil "Keymap used in `edit-tab-stops'.") | |
| 412 (if edit-tab-stops-map | |
| 413 nil | |
| 414 (setq edit-tab-stops-map (make-sparse-keymap)) | |
| 415 (define-key edit-tab-stops-map "\C-x\C-s" 'edit-tab-stops-note-changes) | |
| 416 (define-key edit-tab-stops-map "\C-c\C-c" 'edit-tab-stops-note-changes)) | |
| 417 | |
| 418 (defvar edit-tab-stops-buffer nil | |
| 419 "Buffer whose tab stops are being edited--in case | |
| 420 the variable `tab-stop-list' is local in that buffer.") | |
| 421 | |
| 422 (defun edit-tab-stops () | |
| 423 "Edit the tab stops used by `tab-to-tab-stop'. | |
| 424 Creates a buffer *Tab Stops* containing text describing the tab stops. | |
| 425 A colon indicates a column where there is a tab stop. | |
| 426 You can add or remove colons and then do \\<edit-tab-stops-map>\\[edit-tab-stops-note-changes] to make changes take effect." | |
| 427 (interactive) | |
| 428 (setq edit-tab-stops-buffer (current-buffer)) | |
| 429 (switch-to-buffer (get-buffer-create "*Tab Stops*")) | |
| 430 ;; #### I18N3 should mark buffer as output-translating | |
| 431 (use-local-map edit-tab-stops-map) | |
| 432 (make-local-variable 'indent-tabs-mode) | |
| 433 (setq indent-tabs-mode nil) | |
| 434 (overwrite-mode 1) | |
| 435 (setq truncate-lines t) | |
| 436 (erase-buffer) | |
| 437 (let ((tabs tab-stop-list)) | |
| 438 (while tabs | |
| 439 (indent-to (car tabs) 0) | |
| 440 (insert ?:) | |
| 441 (setq tabs (cdr tabs)))) | |
| 442 (let ((count 0)) | |
| 443 (insert ?\n) | |
| 444 (while (< count 8) | |
| 445 (insert (+ count ?0)) | |
| 446 (insert " ") | |
| 447 (setq count (1+ count))) | |
| 448 (insert ?\n) | |
| 449 (while (> count 0) | |
| 450 (insert "0123456789") | |
| 451 (setq count (1- count)))) | |
| 452 ;; XEmacs | |
| 453 (insert (substitute-command-keys "\nTo install changes, type \\<edit-tab-stops-map>\\[edit-tab-stops-note-changes]")) | |
| 454 (goto-char (point-min))) | |
| 455 | |
| 456 (defun edit-tab-stops-note-changes () | |
| 457 "Put edited tab stops into effect." | |
| 458 (interactive) | |
| 459 (let (tabs) | |
| 460 (save-excursion | |
| 461 (goto-char 1) | |
| 462 (end-of-line) | |
| 463 (while (search-backward ":" nil t) | |
| 464 (setq tabs (cons (current-column) tabs)))) | |
| 465 (bury-buffer (prog1 (current-buffer) | |
| 466 (switch-to-buffer edit-tab-stops-buffer))) | |
| 467 (setq tab-stop-list tabs)) | |
| 468 (message "Tab stops installed")) | |
| 469 | |
| 470 (defun tab-to-tab-stop () | |
| 471 "Insert spaces or tabs to next defined tab-stop column. | |
| 472 The variable `tab-stop-list' is a list of columns at which there are tab stops. | |
| 473 Use \\[edit-tab-stops] to edit them interactively." | |
| 474 (interactive) | |
| 475 (and abbrev-mode (eq (char-syntax (char-before (point))) ?w) | |
| 476 (expand-abbrev)) | |
| 477 (let ((tabs tab-stop-list)) | |
| 478 (while (and tabs (>= (current-column) (car tabs))) | |
| 479 (setq tabs (cdr tabs))) | |
| 480 (if tabs | |
| 481 (let ((opoint (point))) | |
| 482 (skip-chars-backward " \t") | |
| 483 (delete-region (point) opoint) | |
| 484 (indent-to (car tabs))) | |
| 485 (insert ?\ )))) | |
| 486 | |
| 487 (defun move-to-tab-stop () | |
| 488 "Move point to next defined tab-stop column. | |
| 489 The variable `tab-stop-list' is a list of columns at which there are tab stops. | |
| 490 Use \\[edit-tab-stops] to edit them interactively." | |
| 491 (interactive) | |
| 492 (let ((tabs tab-stop-list)) | |
| 493 (while (and tabs (>= (current-column) (car tabs))) | |
| 494 (setq tabs (cdr tabs))) | |
| 495 (if tabs | |
| 496 (let ((before (point))) | |
| 497 (move-to-column (car tabs) t) | |
| 498 (save-excursion | |
| 499 (goto-char before) | |
| 500 ;; If we just added a tab, or moved over one, | |
| 501 ;; delete any superfluous spaces before the old point. | |
| 502 (if (and (eq (char-before (point)) ?\ ) | |
| 503 (eq (char-after (point)) ?\t)) | |
| 504 (let ((tabend (* (/ (current-column) tab-width) tab-width))) | |
| 505 (while (and (> (current-column) tabend) | |
| 506 (eq (char-before (point)) ?\ )) | |
| 446 | 507 (backward-char 1)) |
| 428 | 508 (delete-region (point) before)))))))) |
| 509 | |
| 510 ;(define-key global-map "\t" 'indent-for-tab-command) | |
| 511 ;(define-key esc-map "\034" 'indent-region) | |
| 512 ;(define-key ctl-x-map "\t" 'indent-rigidly) | |
| 513 ;(define-key esc-map "i" 'tab-to-tab-stop) | |
| 514 | |
| 515 ;;; indent.el ends here |