Mercurial > emacs
annotate lisp/subr.el @ 96348:ecd6143014da
Remove unneeded -Defines in the compiler command line (MinGW and MSVC).
* nt/nmake.defs:
* nt/gmake.defs (FONT_CFLAGS): Remove.
(EMACS_EXTRA_C_FLAGS): Don't include FONT_CFLAGS.
(CFLAGS): Don't include WIN32_LEAN_AND_MEAN, _WIN32_WINNT, -D$(ARCH)
and _CRTAPI1.
(ARCH_FLAGS): Don't include _X86_.
* nt/config.nt (_WIN32_WINNT, WIN32_LEAN_AND_MEAN): Define.
* src/makefile.w32-in (LOCAL_FLAGS):
Don't include WINDOWSNT, DOS_NT and _UCHAR_T.
* src/sysdep.c (_spawnlp, _getpid):
Declare with explicit _cdecl instead of _CRTAPI1.
* src/editfns.c (Fget_internal_run_time):
Check for WINDOWSNT with #ifdef, not #if.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 26 Jun 2008 22:33:33 +0000 |
parents | b4e36ff621b3 |
children | a99299e4d2de |
rev | line source |
---|---|
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
648
diff
changeset
|
1 ;;; subr.el --- basic lisp subroutines for Emacs |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
779
diff
changeset
|
2 |
57151
5350f17d0a78
(event-basic-type): Fix mask (extend to 22bits).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57148
diff
changeset
|
3 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, |
79721 | 4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
114 | 5 |
45078 | 6 ;; Maintainer: FSF |
7 ;; Keywords: internal | |
8 | |
114 | 9 ;; This file is part of GNU Emacs. |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94556
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
114 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94556
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94556
diff
changeset
|
14 ;; (at your option) any later version. |
114 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94556
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
114 | 23 |
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37070
diff
changeset
|
24 ;;; Commentary: |
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37070
diff
changeset
|
25 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
779
diff
changeset
|
26 ;;; Code: |
18880
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
27 (defvar custom-declare-variable-list nil |
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
28 "Record `defcustom' calls made before `custom.el' is loaded to handle them. |
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
29 Each element of this list holds the arguments to one call to `defcustom'.") |
114 | 30 |
19662 | 31 ;; Use this, rather than defcustom, in subr.el and other files loaded |
18880
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
32 ;; before custom.el. |
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
33 (defun custom-declare-variable-early (&rest arguments) |
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
34 (setq custom-declare-variable-list |
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
35 (cons arguments custom-declare-variable-list))) |
44129
444bd245e176
(macro-declaration-function): New function. Set the
Gerd Moellmann <gerd@gnu.org>
parents:
43833
diff
changeset
|
36 |
87002
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
37 (defmacro declare-function (fn file &optional arglist fileonly) |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
38 "Tell the byte-compiler that function FN is defined, in FILE. |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
39 Optional ARGLIST is the argument list used by the function. The |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
40 FILE argument is not used by the byte-compiler, but by the |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
41 `check-declare' package, which checks that FILE contains a |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
42 definition for FN. ARGLIST is used by both the byte-compiler and |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
43 `check-declare' to check for consistency. |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
44 |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
45 FILE can be either a Lisp file (in which case the \".el\" |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
46 extension is optional), or a C file. C files are expanded |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
47 relative to the Emacs \"src/\" directory. Lisp files are |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
48 searched for using `locate-library', and if that fails they are |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
49 expanded relative to the location of the file containing the |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
50 declaration. A FILE with an \"ext:\" prefix is an external file. |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
51 `check-declare' will check such files if they are found, and skip |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
52 them without error if they are not. |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
53 |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
54 FILEONLY non-nil means that `check-declare' will only check that |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
55 FILE exists, not that it defines FN. This is intended for |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
56 function-definitions that `check-declare' does not recognize, e.g. |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
57 `defstruct'. |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
58 |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
59 To specify a value for FILEONLY without passing an argument list, |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
60 set ARGLIST to `t'. This is necessary because `nil' means an |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
61 empty argument list, rather than an unspecified one. |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
62 |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
63 Note that for the purposes of `check-declare', this statement |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
64 must be the first non-whitespace on a line, and everything up to |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
65 the end of FILE must be all on the same line. For example: |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
66 |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
67 \(declare-function c-end-of-defun \"progmodes/cc-cmds.el\" |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
68 \(&optional arg)) |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
69 |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
70 For more information, see Info node `elisp(Declaring Functions)'." |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
71 ;; Does nothing - byte-compile-declare-function does the work. |
c6a200c4eebd
(declare-function): Moved from byte-run.el.
Richard M. Stallman <rms@gnu.org>
parents:
86341
diff
changeset
|
72 nil) |
44129
444bd245e176
(macro-declaration-function): New function. Set the
Gerd Moellmann <gerd@gnu.org>
parents:
43833
diff
changeset
|
73 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
74 ;;;; Basic Lisp macros. |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
75 |
40822
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
76 (defalias 'not 'null) |
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
77 |
53197
61703d3393d6
Add macros `1value' and `noreturn'.
Jonathan Yavner <jyavner@member.fsf.org>
parents:
53181
diff
changeset
|
78 (defmacro noreturn (form) |
67899
7c797468d04b
(noreturn, 1value): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
67876
diff
changeset
|
79 "Evaluate FORM, expecting it not to return. |
7c797468d04b
(noreturn, 1value): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
67876
diff
changeset
|
80 If FORM does return, signal an error." |
53197
61703d3393d6
Add macros `1value' and `noreturn'.
Jonathan Yavner <jyavner@member.fsf.org>
parents:
53181
diff
changeset
|
81 `(prog1 ,form |
61703d3393d6
Add macros `1value' and `noreturn'.
Jonathan Yavner <jyavner@member.fsf.org>
parents:
53181
diff
changeset
|
82 (error "Form marked with `noreturn' did return"))) |
61703d3393d6
Add macros `1value' and `noreturn'.
Jonathan Yavner <jyavner@member.fsf.org>
parents:
53181
diff
changeset
|
83 |
61703d3393d6
Add macros `1value' and `noreturn'.
Jonathan Yavner <jyavner@member.fsf.org>
parents:
53181
diff
changeset
|
84 (defmacro 1value (form) |
67899
7c797468d04b
(noreturn, 1value): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
67876
diff
changeset
|
85 "Evaluate FORM, expecting a constant return value. |
7c797468d04b
(noreturn, 1value): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
67876
diff
changeset
|
86 This is the global do-nothing version. There is also `testcover-1value' |
7c797468d04b
(noreturn, 1value): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
67876
diff
changeset
|
87 that complains if FORM ever does return differing values." |
53197
61703d3393d6
Add macros `1value' and `noreturn'.
Jonathan Yavner <jyavner@member.fsf.org>
parents:
53181
diff
changeset
|
88 form) |
61703d3393d6
Add macros `1value' and `noreturn'.
Jonathan Yavner <jyavner@member.fsf.org>
parents:
53181
diff
changeset
|
89 |
71726
a36e654643c1
(def-edebug-spec): Moved here.
Richard M. Stallman <rms@gnu.org>
parents:
71151
diff
changeset
|
90 (defmacro def-edebug-spec (symbol spec) |
a36e654643c1
(def-edebug-spec): Moved here.
Richard M. Stallman <rms@gnu.org>
parents:
71151
diff
changeset
|
91 "Set the `edebug-form-spec' property of SYMBOL according to SPEC. |
76565
f74d08623001
(def-edebug-spec): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
76530
diff
changeset
|
92 Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol |
71726
a36e654643c1
(def-edebug-spec): Moved here.
Richard M. Stallman <rms@gnu.org>
parents:
71151
diff
changeset
|
93 \(naming a function), or a list." |
a36e654643c1
(def-edebug-spec): Moved here.
Richard M. Stallman <rms@gnu.org>
parents:
71151
diff
changeset
|
94 `(put (quote ,symbol) 'edebug-form-spec (quote ,spec))) |
a36e654643c1
(def-edebug-spec): Moved here.
Richard M. Stallman <rms@gnu.org>
parents:
71151
diff
changeset
|
95 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
96 (defmacro lambda (&rest cdr) |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
97 "Return a lambda expression. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
98 A call of the form (lambda ARGS DOCSTRING INTERACTIVE BODY) is |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
99 self-quoting; the result of evaluating the lambda expression is the |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
100 expression itself. The lambda expression may then be treated as a |
10178 | 101 function, i.e., stored as the function value of a symbol, passed to |
63634
ec5194493ae9
(1value, lambda, key-substitution-in-progress): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
63605
diff
changeset
|
102 `funcall' or `mapcar', etc. |
10178 | 103 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
104 ARGS should take the same form as an argument list for a `defun'. |
12395 | 105 DOCSTRING is an optional documentation string. |
106 If present, it should describe how to call the function. | |
107 But documentation strings are usually not useful in nameless functions. | |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
108 INTERACTIVE should be a call to the function `interactive', which see. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
109 It may also be omitted. |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
110 BODY should be a list of Lisp expressions. |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
111 |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
112 \(fn ARGS [DOCSTRING] [INTERACTIVE] BODY)" |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
113 ;; Note that this definition should not use backquotes; subr.el should not |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
114 ;; depend on backquote.el. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
115 (list 'function (cons 'lambda cdr))) |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
116 |
25437 | 117 (defmacro push (newelt listname) |
25580 | 118 "Add NEWELT to the list stored in the symbol LISTNAME. |
25437 | 119 This is equivalent to (setq LISTNAME (cons NEWELT LISTNAME)). |
25436
d24cf1a4dd34
(push, pop): New macros.
Richard M. Stallman <rms@gnu.org>
parents:
25295
diff
changeset
|
120 LISTNAME must be a symbol." |
51611
d201fdadadce
(looking-back): Handle the case of non-trivial regexps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51339
diff
changeset
|
121 (declare (debug (form sexp))) |
25469 | 122 (list 'setq listname |
123 (list 'cons newelt listname))) | |
25436
d24cf1a4dd34
(push, pop): New macros.
Richard M. Stallman <rms@gnu.org>
parents:
25295
diff
changeset
|
124 |
d24cf1a4dd34
(push, pop): New macros.
Richard M. Stallman <rms@gnu.org>
parents:
25295
diff
changeset
|
125 (defmacro pop (listname) |
d24cf1a4dd34
(push, pop): New macros.
Richard M. Stallman <rms@gnu.org>
parents:
25295
diff
changeset
|
126 "Return the first element of LISTNAME's value, and remove it from the list. |
d24cf1a4dd34
(push, pop): New macros.
Richard M. Stallman <rms@gnu.org>
parents:
25295
diff
changeset
|
127 LISTNAME must be a symbol whose value is a list. |
d24cf1a4dd34
(push, pop): New macros.
Richard M. Stallman <rms@gnu.org>
parents:
25295
diff
changeset
|
128 If the value is nil, `pop' returns nil but does not actually |
d24cf1a4dd34
(push, pop): New macros.
Richard M. Stallman <rms@gnu.org>
parents:
25295
diff
changeset
|
129 change the list." |
51611
d201fdadadce
(looking-back): Handle the case of non-trivial regexps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51339
diff
changeset
|
130 (declare (debug (sexp))) |
45823
7ec7fff5e571
(pop): Move the call to `car' outside the prog1, as the compiler
Miles Bader <miles@gnu.org>
parents:
45821
diff
changeset
|
131 (list 'car |
7ec7fff5e571
(pop): Move the call to `car' outside the prog1, as the compiler
Miles Bader <miles@gnu.org>
parents:
45821
diff
changeset
|
132 (list 'prog1 listname |
7ec7fff5e571
(pop): Move the call to `car' outside the prog1, as the compiler
Miles Bader <miles@gnu.org>
parents:
45821
diff
changeset
|
133 (list 'setq listname (list 'cdr listname))))) |
25436
d24cf1a4dd34
(push, pop): New macros.
Richard M. Stallman <rms@gnu.org>
parents:
25295
diff
changeset
|
134 |
16845
adc714dc8e3c
(when, unless): Definitions moved from cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
16556
diff
changeset
|
135 (defmacro when (cond &rest body) |
76530 | 136 "If COND yields non-nil, do BODY, else return nil. |
137 When COND yields non-nil, eval BODY forms sequentially and return | |
138 value of last one, or nil if there are none. | |
139 | |
78149
677d96c34c87
(when, unless): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
78081
diff
changeset
|
140 \(fn COND BODY...)" |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
141 (declare (indent 1) (debug t)) |
16845
adc714dc8e3c
(when, unless): Definitions moved from cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
16556
diff
changeset
|
142 (list 'if cond (cons 'progn body))) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
143 |
16845
adc714dc8e3c
(when, unless): Definitions moved from cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
16556
diff
changeset
|
144 (defmacro unless (cond &rest body) |
76530 | 145 "If COND yields nil, do BODY, else return nil. |
146 When COND yields nil, eval BODY forms sequentially and return | |
147 value of last one, or nil if there are none. | |
148 | |
78149
677d96c34c87
(when, unless): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
78081
diff
changeset
|
149 \(fn COND BODY...)" |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
150 (declare (indent 1) (debug t)) |
16845
adc714dc8e3c
(when, unless): Definitions moved from cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
16556
diff
changeset
|
151 (cons 'if (cons cond (cons nil body)))) |
19491
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
152 |
72096
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
153 (defvar --dolist-tail-- nil |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
154 "Temporary variable used in `dolist' expansion.") |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
155 |
27376
674b7f75841e
(dolist, dotimes): Moved from cl-macs.el.
Richard M. Stallman <rms@gnu.org>
parents:
27297
diff
changeset
|
156 (defmacro dolist (spec &rest body) |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
157 "Loop over a list. |
27376
674b7f75841e
(dolist, dotimes): Moved from cl-macs.el.
Richard M. Stallman <rms@gnu.org>
parents:
27297
diff
changeset
|
158 Evaluate BODY with VAR bound to each car from LIST, in turn. |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
159 Then evaluate RESULT to get return value, default nil. |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
160 |
51817
5e9d88e4fcff
(dolist, dotimes): Doc fix.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
51695
diff
changeset
|
161 \(fn (VAR LIST [RESULT]) BODY...)" |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
162 (declare (indent 1) (debug ((symbolp form &optional form) body))) |
72096
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
163 ;; It would be cleaner to create an uninterned symbol, |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
164 ;; but that uses a lot more space when many functions in many files |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
165 ;; use dolist. |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
166 (let ((temp '--dolist-tail--)) |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
167 `(let ((,temp ,(nth 1 spec)) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
168 ,(car spec)) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
169 (while ,temp |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
170 (setq ,(car spec) (car ,temp)) |
72096
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
171 ,@body |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
172 (setq ,temp (cdr ,temp))) |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
173 ,@(if (cdr (cdr spec)) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
174 `((setq ,(car spec) nil) ,@(cdr (cdr spec))))))) |
27376
674b7f75841e
(dolist, dotimes): Moved from cl-macs.el.
Richard M. Stallman <rms@gnu.org>
parents:
27297
diff
changeset
|
175 |
72096
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
176 (defvar --dotimes-limit-- nil |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
177 "Temporary variable used in `dotimes' expansion.") |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
178 |
27376
674b7f75841e
(dolist, dotimes): Moved from cl-macs.el.
Richard M. Stallman <rms@gnu.org>
parents:
27297
diff
changeset
|
179 (defmacro dotimes (spec &rest body) |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
180 "Loop a certain number of times. |
27376
674b7f75841e
(dolist, dotimes): Moved from cl-macs.el.
Richard M. Stallman <rms@gnu.org>
parents:
27297
diff
changeset
|
181 Evaluate BODY with VAR bound to successive integers running from 0, |
674b7f75841e
(dolist, dotimes): Moved from cl-macs.el.
Richard M. Stallman <rms@gnu.org>
parents:
27297
diff
changeset
|
182 inclusive, to COUNT, exclusive. Then evaluate RESULT to get |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
183 the return value (nil if RESULT is omitted). |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
184 |
51817
5e9d88e4fcff
(dolist, dotimes): Doc fix.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
51695
diff
changeset
|
185 \(fn (VAR COUNT [RESULT]) BODY...)" |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
186 (declare (indent 1) (debug dolist)) |
72096
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
187 ;; It would be cleaner to create an uninterned symbol, |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
188 ;; but that uses a lot more space when many functions in many files |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
189 ;; use dotimes. |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
190 (let ((temp '--dotimes-limit--) |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
191 (start 0) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
192 (end (nth 1 spec))) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
193 `(let ((,temp ,end) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
194 (,(car spec) ,start)) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
195 (while (< ,(car spec) ,temp) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
196 ,@body |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
197 (setq ,(car spec) (1+ ,(car spec)))) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
198 ,@(cdr (cdr spec))))) |
27376
674b7f75841e
(dolist, dotimes): Moved from cl-macs.el.
Richard M. Stallman <rms@gnu.org>
parents:
27297
diff
changeset
|
199 |
53593 | 200 (defmacro declare (&rest specs) |
201 "Do not evaluate any arguments and return nil. | |
202 Treated as a declaration when used at the right place in a | |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
203 `defmacro' form. \(See Info anchor `(elisp)Definition of declare'.)" |
53593 | 204 nil) |
94703
4520f20e7dd1
(ignore-errors): Move here from cl-macs.el.
Glenn Morris <rgm@gnu.org>
parents:
94678
diff
changeset
|
205 |
4520f20e7dd1
(ignore-errors): Move here from cl-macs.el.
Glenn Morris <rgm@gnu.org>
parents:
94678
diff
changeset
|
206 (defmacro ignore-errors (&rest body) |
4520f20e7dd1
(ignore-errors): Move here from cl-macs.el.
Glenn Morris <rgm@gnu.org>
parents:
94678
diff
changeset
|
207 "Execute BODY; if an error occurs, return nil. |
4520f20e7dd1
(ignore-errors): Move here from cl-macs.el.
Glenn Morris <rgm@gnu.org>
parents:
94678
diff
changeset
|
208 Otherwise, return result of last form in BODY." |
4520f20e7dd1
(ignore-errors): Move here from cl-macs.el.
Glenn Morris <rgm@gnu.org>
parents:
94678
diff
changeset
|
209 `(condition-case nil (progn ,@body) (error nil))) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
210 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
211 ;;;; Basic Lisp functions. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
212 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
213 (defun ignore (&rest ignore) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
214 "Do nothing and return nil. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
215 This function accepts any number of arguments, but ignores them." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
216 (interactive) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
217 nil) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
218 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
219 (defun error (&rest args) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
220 "Signal an error, making error message by passing all args to `format'. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
221 In Emacs, the convention is that error messages start with a capital |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
222 letter but *do not* end with a period. Please follow this convention |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
223 for the sake of consistency." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
224 (while t |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
225 (signal 'error (list (apply 'format args))))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
226 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
227 ;; We put this here instead of in frame.el so that it's defined even on |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
228 ;; systems where frame.el isn't loaded. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
229 (defun frame-configuration-p (object) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
230 "Return non-nil if OBJECT seems to be a frame configuration. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
231 Any list whose car is `frame-configuration' is assumed to be a frame |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
232 configuration." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
233 (and (consp object) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
234 (eq (car object) 'frame-configuration))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
235 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
236 (defun functionp (object) |
93735
310118b32104
(functionp): Return nil for special forms.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93721
diff
changeset
|
237 "Non-nil if OBJECT is a function." |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
238 (or (and (symbolp object) (fboundp object) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
239 (condition-case nil |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
240 (setq object (indirect-function object)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
241 (error nil)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
242 (eq (car-safe object) 'autoload) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
243 (not (car-safe (cdr-safe (cdr-safe (cdr-safe (cdr-safe object))))))) |
93735
310118b32104
(functionp): Return nil for special forms.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93721
diff
changeset
|
244 (and (subrp object) |
310118b32104
(functionp): Return nil for special forms.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93721
diff
changeset
|
245 ;; Filter out special forms. |
310118b32104
(functionp): Return nil for special forms.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93721
diff
changeset
|
246 (not (eq 'unevalled (cdr (subr-arity object))))) |
310118b32104
(functionp): Return nil for special forms.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93721
diff
changeset
|
247 (byte-code-function-p object) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
248 (eq (car-safe object) 'lambda))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
249 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
250 ;;;; List functions. |
53593 | 251 |
19491
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
252 (defsubst caar (x) |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
253 "Return the car of the car of X." |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
254 (car (car x))) |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
255 |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
256 (defsubst cadr (x) |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
257 "Return the car of the cdr of X." |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
258 (car (cdr x))) |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
259 |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
260 (defsubst cdar (x) |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
261 "Return the cdr of the car of X." |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
262 (cdr (car x))) |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
263 |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
264 (defsubst cddr (x) |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
265 "Return the cdr of the cdr of X." |
f5fd22f3462c
(caar, cadr, cdar, cddr): Definitions moved here and changed into defsubsts.
Richard M. Stallman <rms@gnu.org>
parents:
19176
diff
changeset
|
266 (cdr (cdr x))) |
19492 | 267 |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
268 (defun last (list &optional n) |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
269 "Return the last link of LIST. Its car is the last element. |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
270 If LIST is nil, return nil. |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
271 If N is non-nil, return the Nth-to-last link of LIST. |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
272 If N is bigger than the length of LIST, return LIST." |
19584
17db1ee36bbb
(last): Accept optional second argument.
Richard M. Stallman <rms@gnu.org>
parents:
19492
diff
changeset
|
273 (if n |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
274 (let ((m 0) (p list)) |
19584
17db1ee36bbb
(last): Accept optional second argument.
Richard M. Stallman <rms@gnu.org>
parents:
19492
diff
changeset
|
275 (while (consp p) |
17db1ee36bbb
(last): Accept optional second argument.
Richard M. Stallman <rms@gnu.org>
parents:
19492
diff
changeset
|
276 (setq m (1+ m) p (cdr p))) |
17db1ee36bbb
(last): Accept optional second argument.
Richard M. Stallman <rms@gnu.org>
parents:
19492
diff
changeset
|
277 (if (<= n 0) p |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
278 (if (< n m) (nthcdr (- m n) list) list))) |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
279 (while (consp (cdr list)) |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
280 (setq list (cdr list))) |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
281 list)) |
22860
349fa4ee1f27
(assoc-default): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22755
diff
changeset
|
282 |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
283 (defun butlast (list &optional n) |
56537
69db3634588e
(butlast, event-modifiers, event-basic-type): Doc fixes.
John Paul Wallington <jpw@pobox.com>
parents:
56402
diff
changeset
|
284 "Return a copy of LIST with the last N elements removed." |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
285 (if (and n (<= n 0)) list |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
286 (nbutlast (copy-sequence list) n))) |
34898
1486728b21f0
(butlast, nbutlast): Moved from cl.el to here.
Kenichi Handa <handa@m17n.org>
parents:
34853
diff
changeset
|
287 |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
288 (defun nbutlast (list &optional n) |
34898
1486728b21f0
(butlast, nbutlast): Moved from cl.el to here.
Kenichi Handa <handa@m17n.org>
parents:
34853
diff
changeset
|
289 "Modifies LIST to remove the last N elements." |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
290 (let ((m (length list))) |
34898
1486728b21f0
(butlast, nbutlast): Moved from cl.el to here.
Kenichi Handa <handa@m17n.org>
parents:
34853
diff
changeset
|
291 (or n (setq n 1)) |
1486728b21f0
(butlast, nbutlast): Moved from cl.el to here.
Kenichi Handa <handa@m17n.org>
parents:
34853
diff
changeset
|
292 (and (< n m) |
1486728b21f0
(butlast, nbutlast): Moved from cl.el to here.
Kenichi Handa <handa@m17n.org>
parents:
34853
diff
changeset
|
293 (progn |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
294 (if (> n 0) (setcdr (nthcdr (- (1- m) n) list) nil)) |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
295 list)))) |
34898
1486728b21f0
(butlast, nbutlast): Moved from cl.el to here.
Kenichi Handa <handa@m17n.org>
parents:
34853
diff
changeset
|
296 |
53626
ee432d9e3bbd
(delete-dups): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53593
diff
changeset
|
297 (defun delete-dups (list) |
54016
15b3e94eebd4
(delete-dups): A better implementation from Karl Heuer <kwzh@gnu.org>.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53994
diff
changeset
|
298 "Destructively remove `equal' duplicates from LIST. |
15b3e94eebd4
(delete-dups): A better implementation from Karl Heuer <kwzh@gnu.org>.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53994
diff
changeset
|
299 Store the result in LIST and return it. LIST must be a proper list. |
15b3e94eebd4
(delete-dups): A better implementation from Karl Heuer <kwzh@gnu.org>.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53994
diff
changeset
|
300 Of several `equal' occurrences of an element in LIST, the first |
15b3e94eebd4
(delete-dups): A better implementation from Karl Heuer <kwzh@gnu.org>.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53994
diff
changeset
|
301 one is kept." |
53626
ee432d9e3bbd
(delete-dups): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53593
diff
changeset
|
302 (let ((tail list)) |
ee432d9e3bbd
(delete-dups): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53593
diff
changeset
|
303 (while tail |
54016
15b3e94eebd4
(delete-dups): A better implementation from Karl Heuer <kwzh@gnu.org>.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53994
diff
changeset
|
304 (setcdr tail (delete (car tail) (cdr tail))) |
15b3e94eebd4
(delete-dups): A better implementation from Karl Heuer <kwzh@gnu.org>.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53994
diff
changeset
|
305 (setq tail (cdr tail)))) |
53626
ee432d9e3bbd
(delete-dups): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53593
diff
changeset
|
306 list) |
ee432d9e3bbd
(delete-dups): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53593
diff
changeset
|
307 |
50449
f85be9da34a2
Adjust number-sequence code
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
50427
diff
changeset
|
308 (defun number-sequence (from &optional to inc) |
50415
b040b4e36f5e
(number-sequence): New function.
Kenichi Handa <handa@m17n.org>
parents:
50136
diff
changeset
|
309 "Return a sequence of numbers from FROM to TO (both inclusive) as a list. |
53174
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
310 INC is the increment used between numbers in the sequence and defaults to 1. |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
311 So, the Nth element of the list is \(+ FROM \(* N INC)) where N counts from |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
312 zero. TO is only included if there is an N for which TO = FROM + N * INC. |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
313 If TO is nil or numerically equal to FROM, return \(FROM). |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
314 If INC is positive and TO is less than FROM, or INC is negative |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
315 and TO is larger than FROM, return nil. |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
316 If INC is zero and TO is neither nil nor numerically equal to |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
317 FROM, signal an error. |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
318 |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
319 This function is primarily designed for integer arguments. |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
320 Nevertheless, FROM, TO and INC can be integer or float. However, |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
321 floating point arithmetic is inexact. For instance, depending on |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
322 the machine, it may quite well happen that |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
323 \(number-sequence 0.4 0.6 0.2) returns the one element list \(0.4), |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
324 whereas \(number-sequence 0.4 0.8 0.2) returns a list with three |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
325 elements. Thus, if some of the arguments are floats and one wants |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
326 to make sure that TO is included, one may have to explicitly write |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
327 TO as \(+ FROM \(* N INC)) or use a variable whose value was |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
328 computed with this exact expression. Alternatively, you can, |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
329 of course, also replace TO with a slightly larger value |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
330 \(or a slightly more negative value if INC is negative)." |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
331 (if (or (not to) (= from to)) |
50449
f85be9da34a2
Adjust number-sequence code
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
50427
diff
changeset
|
332 (list from) |
f85be9da34a2
Adjust number-sequence code
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
50427
diff
changeset
|
333 (or inc (setq inc 1)) |
53174
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
334 (when (zerop inc) (error "The increment can not be zero")) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
335 (let (seq (n 0) (next from)) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
336 (if (> inc 0) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
337 (while (<= next to) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
338 (setq seq (cons next seq) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
339 n (1+ n) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
340 next (+ from (* n inc)))) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
341 (while (>= next to) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
342 (setq seq (cons next seq) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
343 n (1+ n) |
5f50db6e04c6
(number-sequence): Improve handling of floating point arguments
Luc Teirlinck <teirllm@auburn.edu>
parents:
53132
diff
changeset
|
344 next (+ from (* n inc))))) |
50449
f85be9da34a2
Adjust number-sequence code
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
50427
diff
changeset
|
345 (nreverse seq)))) |
50415
b040b4e36f5e
(number-sequence): New function.
Kenichi Handa <handa@m17n.org>
parents:
50136
diff
changeset
|
346 |
45690
9d351e5869c8
(copy-list): Moved here from cl.el.
Colin Walters <walters@gnu.org>
parents:
45587
diff
changeset
|
347 (defun copy-tree (tree &optional vecp) |
9d351e5869c8
(copy-list): Moved here from cl.el.
Colin Walters <walters@gnu.org>
parents:
45587
diff
changeset
|
348 "Make a copy of TREE. |
9d351e5869c8
(copy-list): Moved here from cl.el.
Colin Walters <walters@gnu.org>
parents:
45587
diff
changeset
|
349 If TREE is a cons cell, this recursively copies both its car and its cdr. |
45740
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
350 Contrast to `copy-sequence', which copies only along the cdrs. With second |
45690
9d351e5869c8
(copy-list): Moved here from cl.el.
Colin Walters <walters@gnu.org>
parents:
45587
diff
changeset
|
351 argument VECP, this copies vectors as well as conses." |
9d351e5869c8
(copy-list): Moved here from cl.el.
Colin Walters <walters@gnu.org>
parents:
45587
diff
changeset
|
352 (if (consp tree) |
45740
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
353 (let (result) |
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
354 (while (consp tree) |
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
355 (let ((newcar (car tree))) |
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
356 (if (or (consp (car tree)) (and vecp (vectorp (car tree)))) |
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
357 (setq newcar (copy-tree (car tree) vecp))) |
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
358 (push newcar result)) |
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
359 (setq tree (cdr tree))) |
45821
41129d3d126b
(copy-tree): Use `nconc' and `nreverse' instead of `nreconc'.
Miles Bader <miles@gnu.org>
parents:
45740
diff
changeset
|
360 (nconc (nreverse result) tree)) |
45690
9d351e5869c8
(copy-list): Moved here from cl.el.
Colin Walters <walters@gnu.org>
parents:
45587
diff
changeset
|
361 (if (and vecp (vectorp tree)) |
9d351e5869c8
(copy-list): Moved here from cl.el.
Colin Walters <walters@gnu.org>
parents:
45587
diff
changeset
|
362 (let ((i (length (setq tree (copy-sequence tree))))) |
9d351e5869c8
(copy-list): Moved here from cl.el.
Colin Walters <walters@gnu.org>
parents:
45587
diff
changeset
|
363 (while (>= (setq i (1- i)) 0) |
45740
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
364 (aset tree i (copy-tree (aref tree i) vecp))) |
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
365 tree) |
4e576724db9f
(copy-list): Moved to cl.el.
Richard M. Stallman <rms@gnu.org>
parents:
45690
diff
changeset
|
366 tree))) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
367 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
368 ;;;; Various list-search functions. |
45690
9d351e5869c8
(copy-list): Moved here from cl.el.
Colin Walters <walters@gnu.org>
parents:
45587
diff
changeset
|
369 |
22959
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
370 (defun assoc-default (key alist &optional test default) |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
371 "Find object KEY in a pseudo-alist ALIST. |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
372 ALIST is a list of conses or objects. Each element (or the element's car, |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
373 if it is a cons) is compared with KEY by evaluating (TEST (car elt) KEY). |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
374 If that is non-nil, the element matches; |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
375 then `assoc-default' returns the element's cdr, if it is a cons, |
22860
349fa4ee1f27
(assoc-default): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22755
diff
changeset
|
376 or DEFAULT if the element is not a cons. |
22959
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
377 |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
378 If no element matches, the value is nil. |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
379 If TEST is omitted or nil, `equal' is used." |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
380 (let (found (tail alist) value) |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
381 (while (and tail (not found)) |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
382 (let ((elt (car tail))) |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
383 (when (funcall (or test 'equal) (if (consp elt) (car elt) elt) key) |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
384 (setq found t value (if (consp elt) (cdr elt) default)))) |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
385 (setq tail (cdr tail))) |
73a21b5f9bd8
(assoc-default): Rewrite not to use dolist.
Richard M. Stallman <rms@gnu.org>
parents:
22860
diff
changeset
|
386 value)) |
25295
737e82c21934
(assoc-ignore-case, assoc-ignore-representation): Moved here from simple.el.
Karl Heuer <kwzh@gnu.org>
parents:
25293
diff
changeset
|
387 |
93971
2d29453eb5e6
(assoc-ignore-case, assoc-ignore-representation):
Juanma Barranquero <lekktu@gmail.com>
parents:
93825
diff
changeset
|
388 (make-obsolete 'assoc-ignore-case 'assoc-string "22.1") |
25295
737e82c21934
(assoc-ignore-case, assoc-ignore-representation): Moved here from simple.el.
Karl Heuer <kwzh@gnu.org>
parents:
25293
diff
changeset
|
389 (defun assoc-ignore-case (key alist) |
737e82c21934
(assoc-ignore-case, assoc-ignore-representation): Moved here from simple.el.
Karl Heuer <kwzh@gnu.org>
parents:
25293
diff
changeset
|
390 "Like `assoc', but ignores differences in case and text representation. |
737e82c21934
(assoc-ignore-case, assoc-ignore-representation): Moved here from simple.el.
Karl Heuer <kwzh@gnu.org>
parents:
25293
diff
changeset
|
391 KEY must be a string. Upper-case and lower-case letters are treated as equal. |
737e82c21934
(assoc-ignore-case, assoc-ignore-representation): Moved here from simple.el.
Karl Heuer <kwzh@gnu.org>
parents:
25293
diff
changeset
|
392 Unibyte strings are converted to multibyte for comparison." |
53412
a2bba9e88b95
(assoc-ignore-case, assoc-ignore-representation):
Richard M. Stallman <rms@gnu.org>
parents:
53368
diff
changeset
|
393 (assoc-string key alist t)) |
25295
737e82c21934
(assoc-ignore-case, assoc-ignore-representation): Moved here from simple.el.
Karl Heuer <kwzh@gnu.org>
parents:
25293
diff
changeset
|
394 |
93971
2d29453eb5e6
(assoc-ignore-case, assoc-ignore-representation):
Juanma Barranquero <lekktu@gmail.com>
parents:
93825
diff
changeset
|
395 (make-obsolete 'assoc-ignore-representation 'assoc-string "22.1") |
25295
737e82c21934
(assoc-ignore-case, assoc-ignore-representation): Moved here from simple.el.
Karl Heuer <kwzh@gnu.org>
parents:
25293
diff
changeset
|
396 (defun assoc-ignore-representation (key alist) |
737e82c21934
(assoc-ignore-case, assoc-ignore-representation): Moved here from simple.el.
Karl Heuer <kwzh@gnu.org>
parents:
25293
diff
changeset
|
397 "Like `assoc', but ignores differences in text representation. |
47916 | 398 KEY must be a string. |
25295
737e82c21934
(assoc-ignore-case, assoc-ignore-representation): Moved here from simple.el.
Karl Heuer <kwzh@gnu.org>
parents:
25293
diff
changeset
|
399 Unibyte strings are converted to multibyte for comparison." |
53412
a2bba9e88b95
(assoc-ignore-case, assoc-ignore-representation):
Richard M. Stallman <rms@gnu.org>
parents:
53368
diff
changeset
|
400 (assoc-string key alist nil)) |
28490
9958b6d95bd6
(member-ignore-case): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28234
diff
changeset
|
401 |
9958b6d95bd6
(member-ignore-case): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28234
diff
changeset
|
402 (defun member-ignore-case (elt list) |
9958b6d95bd6
(member-ignore-case): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28234
diff
changeset
|
403 "Like `member', but ignores differences in case and text representation. |
9958b6d95bd6
(member-ignore-case): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28234
diff
changeset
|
404 ELT must be a string. Upper-case and lower-case letters are treated as equal. |
44900
e4975d9c93ff
(insert-for-yank): Replace `category' property
Richard M. Stallman <rms@gnu.org>
parents:
44723
diff
changeset
|
405 Unibyte strings are converted to multibyte for comparison. |
e4975d9c93ff
(insert-for-yank): Replace `category' property
Richard M. Stallman <rms@gnu.org>
parents:
44723
diff
changeset
|
406 Non-strings in LIST are ignored." |
e4975d9c93ff
(insert-for-yank): Replace `category' property
Richard M. Stallman <rms@gnu.org>
parents:
44723
diff
changeset
|
407 (while (and list |
e4975d9c93ff
(insert-for-yank): Replace `category' property
Richard M. Stallman <rms@gnu.org>
parents:
44723
diff
changeset
|
408 (not (and (stringp (car list)) |
e4975d9c93ff
(insert-for-yank): Replace `category' property
Richard M. Stallman <rms@gnu.org>
parents:
44723
diff
changeset
|
409 (eq t (compare-strings elt 0 nil (car list) 0 nil t))))) |
33978
9aa3fd6779f7
(member-ignore-case): Return the tail of the list who's car matches,
Miles Bader <miles@gnu.org>
parents:
33835
diff
changeset
|
410 (setq list (cdr list))) |
9aa3fd6779f7
(member-ignore-case): Return the tail of the list who's car matches,
Miles Bader <miles@gnu.org>
parents:
33835
diff
changeset
|
411 list) |
28490
9958b6d95bd6
(member-ignore-case): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28234
diff
changeset
|
412 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
413 (defun assq-delete-all (key alist) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
414 "Delete from ALIST all elements whose car is `eq' to KEY. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
415 Return the modified alist. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
416 Elements of ALIST that are not conses are ignored." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
417 (while (and (consp (car alist)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
418 (eq (car (car alist)) key)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
419 (setq alist (cdr alist))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
420 (let ((tail alist) tail-cdr) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
421 (while (setq tail-cdr (cdr tail)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
422 (if (and (consp (car tail-cdr)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
423 (eq (car (car tail-cdr)) key)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
424 (setcdr tail (cdr tail-cdr)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
425 (setq tail tail-cdr)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
426 alist) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
427 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
428 (defun rassq-delete-all (value alist) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
429 "Delete from ALIST all elements whose cdr is `eq' to VALUE. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
430 Return the modified alist. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
431 Elements of ALIST that are not conses are ignored." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
432 (while (and (consp (car alist)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
433 (eq (cdr (car alist)) value)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
434 (setq alist (cdr alist))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
435 (let ((tail alist) tail-cdr) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
436 (while (setq tail-cdr (cdr tail)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
437 (if (and (consp (car tail-cdr)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
438 (eq (cdr (car tail-cdr)) value)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
439 (setcdr tail (cdr tail-cdr)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
440 (setq tail tail-cdr)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
441 alist) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
442 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
443 (defun remove (elt seq) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
444 "Return a copy of SEQ with all occurrences of ELT removed. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
445 SEQ must be a list, vector, or string. The comparison is done with `equal'." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
446 (if (nlistp seq) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
447 ;; If SEQ isn't a list, there's no need to copy SEQ because |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
448 ;; `delete' will return a new object. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
449 (delete elt seq) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
450 (delete elt (copy-sequence seq)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
451 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
452 (defun remq (elt list) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
453 "Return LIST with all occurrences of ELT removed. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
454 The comparison is done with `eq'. Contrary to `delq', this does not use |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
455 side-effects, and the argument LIST is not modified." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
456 (if (memq elt list) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
457 (delq elt (copy-sequence list)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
458 list)) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
459 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
460 ;;;; Keymap support. |
114 | 461 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
462 (defmacro kbd (keys) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
463 "Convert KEYS to the internal Emacs key representation. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
464 KEYS should be a string constant in the format used for |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
465 saving keyboard macros (see `edmacro-mode')." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
466 (read-kbd-macro keys)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
467 |
114 | 468 (defun undefined () |
469 (interactive) | |
470 (ding)) | |
471 | |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
472 ;; Prevent the \{...} documentation construct |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
473 ;; from mentioning keys that run this command. |
114 | 474 (put 'undefined 'suppress-keymap t) |
475 | |
476 (defun suppress-keymap (map &optional nodigits) | |
477 "Make MAP override all normally self-inserting keys to be undefined. | |
478 Normally, as an exception, digits and minus-sign are set to make prefix args, | |
479 but optional second arg NODIGITS non-nil treats them like other chars." | |
47042
74f8b41068e0
(suppress-keymap): Use command remapping instead of
Kim F. Storm <storm@cua.dk>
parents:
47025
diff
changeset
|
480 (define-key map [remap self-insert-command] 'undefined) |
114 | 481 (or nodigits |
482 (let (loop) | |
483 (define-key map "-" 'negative-argument) | |
484 ;; Make plain numbers do numeric args. | |
485 (setq loop ?0) | |
486 (while (<= loop ?9) | |
487 (define-key map (char-to-string loop) 'digit-argument) | |
488 (setq loop (1+ loop)))))) | |
489 | |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
490 (defun define-key-after (keymap key definition &optional after) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
491 "Add binding in KEYMAP for KEY => DEFINITION, right after AFTER's binding. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
492 This is like `define-key' except that the binding for KEY is placed |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
493 just after the binding for the event AFTER, instead of at the beginning |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
494 of the map. Note that AFTER must be an event type (like KEY), NOT a command |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
495 \(like DEFINITION). |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
496 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
497 If AFTER is t or omitted, the new binding goes at the end of the keymap. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
498 AFTER should be a single event type--a symbol or a character, not a sequence. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
499 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
500 Bindings are always added before any inherited map. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
501 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
502 The order of bindings in a keymap matters when it is used as a menu." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
503 (unless after (setq after t)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
504 (or (keymapp keymap) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
505 (signal 'wrong-type-argument (list 'keymapp keymap))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
506 (setq key |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
507 (if (<= (length key) 1) (aref key 0) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
508 (setq keymap (lookup-key keymap |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
509 (apply 'vector |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
510 (butlast (mapcar 'identity key))))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
511 (aref key (1- (length key))))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
512 (let ((tail keymap) done inserted) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
513 (while (and (not done) tail) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
514 ;; Delete any earlier bindings for the same key. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
515 (if (eq (car-safe (car (cdr tail))) key) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
516 (setcdr tail (cdr (cdr tail)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
517 ;; If we hit an included map, go down that one. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
518 (if (keymapp (car tail)) (setq tail (car tail))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
519 ;; When we reach AFTER's binding, insert the new binding after. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
520 ;; If we reach an inherited keymap, insert just before that. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
521 ;; If we reach the end of this keymap, insert at the end. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
522 (if (or (and (eq (car-safe (car tail)) after) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
523 (not (eq after t))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
524 (eq (car (cdr tail)) 'keymap) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
525 (null (cdr tail))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
526 (progn |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
527 ;; Stop the scan only if we find a parent keymap. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
528 ;; Keep going past the inserted element |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
529 ;; so we can delete any duplications that come later. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
530 (if (eq (car (cdr tail)) 'keymap) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
531 (setq done t)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
532 ;; Don't insert more than once. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
533 (or inserted |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
534 (setcdr tail (cons (cons key definition) (cdr tail)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
535 (setq inserted t))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
536 (setq tail (cdr tail))))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
537 |
93204
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
538 (defun map-keymap-sorted (function keymap) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
539 "Implement `map-keymap' with sorting. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
540 Don't call this function; it is for internal use only." |
93204
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
541 (let (list) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
542 (map-keymap (lambda (a b) (push (cons a b) list)) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
543 keymap) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
544 (setq list (sort list |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
545 (lambda (a b) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
546 (setq a (car a) b (car b)) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
547 (if (integerp a) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
548 (if (integerp b) (< a b) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
549 t) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
550 (if (integerp b) t |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
551 ;; string< also accepts symbols. |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
552 (string< a b)))))) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
553 (dolist (p list) |
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93200
diff
changeset
|
554 (funcall function (car p) (cdr p))))) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
555 |
93664
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
556 (defun keymap-canonicalize (map) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
557 "Return an equivalent keymap, without inheritance." |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
558 (let ((bindings ()) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
559 (ranges ())) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
560 (while (keymapp map) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
561 (setq map (map-keymap-internal |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
562 (lambda (key item) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
563 (if (consp key) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
564 ;; Treat char-ranges specially. |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
565 (push (cons key item) ranges) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
566 (push (cons key item) bindings))) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
567 map))) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
568 (setq map (funcall (if ranges 'make-keymap 'make-sparse-keymap) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
569 (keymap-prompt map))) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
570 (dolist (binding ranges) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
571 ;; Treat char-ranges specially. |
93721
6604d09cf521
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93664
diff
changeset
|
572 (define-key map (vector (car binding)) (cdr binding))) |
93664
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
573 (dolist (binding (prog1 bindings (setq bindings ()))) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
574 (let* ((key (car binding)) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
575 (item (cdr binding)) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
576 (oldbind (assq key bindings))) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
577 ;; Newer bindings override older. |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
578 (if oldbind (setq bindings (delq oldbind bindings))) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
579 (when item ;nil bindings just hide older ones. |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
580 (push binding bindings)))) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
581 (nconc map bindings))) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93396
diff
changeset
|
582 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
583 (put 'keyboard-translate-table 'char-table-extra-slots 0) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
584 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
585 (defun keyboard-translate (from to) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
586 "Translate character FROM to TO at a low level. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
587 This function creates a `keyboard-translate-table' if necessary |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
588 and then modifies one entry in it." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
589 (or (char-table-p keyboard-translate-table) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
590 (setq keyboard-translate-table |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
591 (make-char-table 'keyboard-translate-table nil))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
592 (aset keyboard-translate-table from to)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
593 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
594 ;;;; Key binding commands. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
595 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
596 (defun global-set-key (key command) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
597 "Give KEY a global binding as COMMAND. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
598 COMMAND is the command definition to use; usually it is |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
599 a symbol naming an interactively-callable function. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
600 KEY is a key sequence; noninteractively, it is a string or vector |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
601 of characters or event types, and non-ASCII characters with codes |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
602 above 127 (such as ISO Latin-1) can be included if you use a vector. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
603 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
604 Note that if KEY has a local binding in the current buffer, |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
605 that local binding will continue to shadow any global binding |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
606 that you make with this function." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
607 (interactive "KSet key globally: \nCSet key %s to command: ") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
608 (or (vectorp key) (stringp key) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
609 (signal 'wrong-type-argument (list 'arrayp key))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
610 (define-key (current-global-map) key command)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
611 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
612 (defun local-set-key (key command) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
613 "Give KEY a local binding as COMMAND. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
614 COMMAND is the command definition to use; usually it is |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
615 a symbol naming an interactively-callable function. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
616 KEY is a key sequence; noninteractively, it is a string or vector |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
617 of characters or event types, and non-ASCII characters with codes |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
618 above 127 (such as ISO Latin-1) can be included if you use a vector. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
619 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
620 The binding goes in the current buffer's local map, |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
621 which in most cases is shared with all other buffers in the same major mode." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
622 (interactive "KSet key locally: \nCSet key %s locally to command: ") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
623 (let ((map (current-local-map))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
624 (or map |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
625 (use-local-map (setq map (make-sparse-keymap)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
626 (or (vectorp key) (stringp key) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
627 (signal 'wrong-type-argument (list 'arrayp key))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
628 (define-key map key command))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
629 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
630 (defun global-unset-key (key) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
631 "Remove global binding of KEY. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
632 KEY is a string or vector representing a sequence of keystrokes." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
633 (interactive "kUnset key globally: ") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
634 (global-set-key key nil)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
635 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
636 (defun local-unset-key (key) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
637 "Remove local binding of KEY. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
638 KEY is a string or vector representing a sequence of keystrokes." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
639 (interactive "kUnset key locally: ") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
640 (if (current-local-map) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
641 (local-set-key key nil)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
642 nil) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
643 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
644 ;;;; substitute-key-definition and its subroutines. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
645 |
6167
1ad8f8ccdc2b
(substitute-key-definition): Avoid infinite recursion.
Karl Heuer <kwzh@gnu.org>
parents:
6039
diff
changeset
|
646 (defvar key-substitution-in-progress nil |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
647 "Used internally by `substitute-key-definition'.") |
6167
1ad8f8ccdc2b
(substitute-key-definition): Avoid infinite recursion.
Karl Heuer <kwzh@gnu.org>
parents:
6039
diff
changeset
|
648 |
61967
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
649 (defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix) |
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
650 "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF. |
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
651 In other words, OLDDEF is replaced with NEWDEF where ever it appears. |
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
652 Alternatively, if optional fourth argument OLDMAP is specified, we redefine |
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
653 in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP. |
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
654 |
68830
a924d28d2d25
(substitute-key-definition): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68777
diff
changeset
|
655 If you don't specify OLDMAP, you can usually get the same results |
a924d28d2d25
(substitute-key-definition): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68777
diff
changeset
|
656 in a cleaner way with command remapping, like this: |
68848
f038d760daf1
(substitute-key-definition): Doc fix (hide internal argument).
Juanma Barranquero <lekktu@gmail.com>
parents:
68830
diff
changeset
|
657 \(define-key KEYMAP [remap OLDDEF] NEWDEF) |
f038d760daf1
(substitute-key-definition): Doc fix (hide internal argument).
Juanma Barranquero <lekktu@gmail.com>
parents:
68830
diff
changeset
|
658 \n(fn OLDDEF NEWDEF KEYMAP &optional OLDMAP)" |
28868
e62636f5d724
(substitute-key-definition): Add comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
28863
diff
changeset
|
659 ;; Don't document PREFIX in the doc string because we don't want to |
e62636f5d724
(substitute-key-definition): Add comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
28863
diff
changeset
|
660 ;; advertise it. It's meant for recursive calls only. Here's its |
e62636f5d724
(substitute-key-definition): Add comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
28863
diff
changeset
|
661 ;; meaning |
47916 | 662 |
28868
e62636f5d724
(substitute-key-definition): Add comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
28863
diff
changeset
|
663 ;; If optional argument PREFIX is specified, it should be a key |
e62636f5d724
(substitute-key-definition): Add comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
28863
diff
changeset
|
664 ;; prefix, a string. Redefined bindings will then be bound to the |
e62636f5d724
(substitute-key-definition): Add comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
28863
diff
changeset
|
665 ;; original key, with PREFIX added at the front. |
1176 | 666 (or prefix (setq prefix "")) |
667 (let* ((scan (or oldmap keymap)) | |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
668 (prefix1 (vconcat prefix [nil])) |
6167
1ad8f8ccdc2b
(substitute-key-definition): Avoid infinite recursion.
Karl Heuer <kwzh@gnu.org>
parents:
6039
diff
changeset
|
669 (key-substitution-in-progress |
1ad8f8ccdc2b
(substitute-key-definition): Avoid infinite recursion.
Karl Heuer <kwzh@gnu.org>
parents:
6039
diff
changeset
|
670 (cons scan key-substitution-in-progress))) |
1176 | 671 ;; Scan OLDMAP, finding each char or event-symbol that |
672 ;; has any definition, and act on it with hack-key. | |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
673 (map-keymap |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
674 (lambda (char defn) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
675 (aset prefix1 (length prefix) char) |
61967
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
676 (substitute-key-definition-key defn olddef newdef prefix1 keymap)) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
677 scan))) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
678 |
61967
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
679 (defun substitute-key-definition-key (defn olddef newdef prefix keymap) |
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
680 (let (inner-def skipped menu-item) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
681 ;; Find the actual command name within the binding. |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
682 (if (eq (car-safe defn) 'menu-item) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
683 (setq menu-item defn defn (nth 2 defn)) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
684 ;; Skip past menu-prompt. |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
685 (while (stringp (car-safe defn)) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
686 (push (pop defn) skipped)) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
687 ;; Skip past cached key-equivalence data for menu items. |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
688 (if (consp (car-safe defn)) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
689 (setq defn (cdr defn)))) |
61967
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
690 (if (or (eq defn olddef) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
691 ;; Compare with equal if definition is a key sequence. |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
692 ;; That is useful for operating on function-key-map. |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
693 (and (or (stringp defn) (vectorp defn)) |
61967
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
694 (equal defn olddef))) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
695 (define-key keymap prefix |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
696 (if menu-item |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
697 (let ((copy (copy-sequence menu-item))) |
61967
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
698 (setcar (nthcdr 2 copy) newdef) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
699 copy) |
61967
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
700 (nconc (nreverse skipped) newdef))) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
701 ;; Look past a symbol that names a keymap. |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
702 (setq inner-def |
68759
0b4b98e12e73
(substitute-key-definition-key): Pass t for NOERROR to
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
703 (or (indirect-function defn t) defn)) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
704 ;; For nested keymaps, we use `inner-def' rather than `defn' so as to |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
705 ;; avoid autoloading a keymap. This is mostly done to preserve the |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
706 ;; original non-autoloading behavior of pre-map-keymap times. |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
707 (if (and (keymapp inner-def) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
708 ;; Avoid recursively scanning |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
709 ;; where KEYMAP does not have a submap. |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
710 (let ((elt (lookup-key keymap prefix))) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
711 (or (null elt) (natnump elt) (keymapp elt))) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
712 ;; Avoid recursively rescanning keymap being scanned. |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
713 (not (memq inner-def key-substitution-in-progress))) |
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
714 ;; If this one isn't being scanned already, scan it now. |
61967
d9764486d42f
(dot, dot-marker, dot-min, dot-max, buffer-flush-undo)
Nick Roberts <nickrob@snap.net.nz>
parents:
61955
diff
changeset
|
715 (substitute-key-definition olddef newdef keymap inner-def prefix))))) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
716 |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
717 |
47916 | 718 ;;;; The global keymap tree. |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
719 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
720 ;;; global-map, esc-map, and ctl-x-map have their values set up in |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
721 ;;; keymap.c; we just give them docstrings here. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
722 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
723 (defvar global-map nil |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
724 "Default global keymap mapping Emacs keyboard input into commands. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
725 The value is a keymap which is usually (but not necessarily) Emacs's |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
726 global map.") |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
727 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
728 (defvar esc-map nil |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
729 "Default keymap for ESC (meta) commands. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
730 The normal global definition of the character ESC indirects to this keymap.") |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
731 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
732 (defvar ctl-x-map nil |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
733 "Default keymap for C-x commands. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
734 The normal global definition of the character C-x indirects to this keymap.") |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
735 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
736 (defvar ctl-x-4-map (make-sparse-keymap) |
41955 | 737 "Keymap for subcommands of C-x 4.") |
2569
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
738 (defalias 'ctl-x-4-prefix ctl-x-4-map) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
739 (define-key ctl-x-map "4" 'ctl-x-4-prefix) |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
740 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
741 (defvar ctl-x-5-map (make-sparse-keymap) |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
742 "Keymap for frame commands.") |
2569
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
743 (defalias 'ctl-x-5-prefix ctl-x-5-map) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
744 (define-key ctl-x-map "5" 'ctl-x-5-prefix) |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
745 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
746 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
747 ;;;; Event manipulation functions. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
748 |
10693
0875851842f0
(listify-key-sequence-1, event-modifiers): Don't presume internal bit layout
Karl Heuer <kwzh@gnu.org>
parents:
10681
diff
changeset
|
749 ;; The call to `read' is to ensure that the value is computed at load time |
0875851842f0
(listify-key-sequence-1, event-modifiers): Don't presume internal bit layout
Karl Heuer <kwzh@gnu.org>
parents:
10681
diff
changeset
|
750 ;; and not compiled into the .elc file. The value is negative on most |
0875851842f0
(listify-key-sequence-1, event-modifiers): Don't presume internal bit layout
Karl Heuer <kwzh@gnu.org>
parents:
10681
diff
changeset
|
751 ;; machines, but not on all! |
0875851842f0
(listify-key-sequence-1, event-modifiers): Don't presume internal bit layout
Karl Heuer <kwzh@gnu.org>
parents:
10681
diff
changeset
|
752 (defconst listify-key-sequence-1 (logior 128 (read "?\\M-\\^@"))) |
3153
4c94c9faf1af
(listify-key-sequence): Avoid the constant ?\M-\200.
Richard M. Stallman <rms@gnu.org>
parents:
2963
diff
changeset
|
753 |
2021
8b9286bffef8
(listify-key-sequence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1959
diff
changeset
|
754 (defun listify-key-sequence (key) |
8b9286bffef8
(listify-key-sequence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1959
diff
changeset
|
755 "Convert a key sequence to a list of events." |
8b9286bffef8
(listify-key-sequence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1959
diff
changeset
|
756 (if (vectorp key) |
8b9286bffef8
(listify-key-sequence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1959
diff
changeset
|
757 (append key nil) |
8b9286bffef8
(listify-key-sequence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1959
diff
changeset
|
758 (mapcar (function (lambda (c) |
8b9286bffef8
(listify-key-sequence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1959
diff
changeset
|
759 (if (> c 127) |
3153
4c94c9faf1af
(listify-key-sequence): Avoid the constant ?\M-\200.
Richard M. Stallman <rms@gnu.org>
parents:
2963
diff
changeset
|
760 (logxor c listify-key-sequence-1) |
2021
8b9286bffef8
(listify-key-sequence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1959
diff
changeset
|
761 c))) |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
762 key))) |
2021
8b9286bffef8
(listify-key-sequence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
1959
diff
changeset
|
763 |
2040
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
764 (defsubst eventp (obj) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
765 "True if the argument is an event object." |
55520
30d4272bcc4b
(eventp): Be more discriminating with integers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55502
diff
changeset
|
766 (or (and (integerp obj) |
30d4272bcc4b
(eventp): Be more discriminating with integers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55502
diff
changeset
|
767 ;; Filter out integers too large to be events. |
30d4272bcc4b
(eventp): Be more discriminating with integers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55502
diff
changeset
|
768 ;; M is the biggest modifier. |
30d4272bcc4b
(eventp): Be more discriminating with integers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55502
diff
changeset
|
769 (zerop (logand obj (lognot (1- (lsh ?\M-\^@ 1))))) |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
770 (characterp (event-basic-type obj))) |
2040
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
771 (and (symbolp obj) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
772 (get obj 'event-symbol-elements)) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
773 (and (consp obj) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
774 (symbolp (car obj)) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
775 (get (car obj) 'event-symbol-elements)))) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
776 |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
777 (defun event-modifiers (event) |
56537
69db3634588e
(butlast, event-modifiers, event-basic-type): Doc fixes.
John Paul Wallington <jpw@pobox.com>
parents:
56402
diff
changeset
|
778 "Return a list of symbols representing the modifier keys in event EVENT. |
2040
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
779 The elements of the list may include `meta', `control', |
4414
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
780 `shift', `hyper', `super', `alt', `click', `double', `triple', `drag', |
56570
059dc717baef
(event-modifiers, event-basic-type): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56565
diff
changeset
|
781 and `down'. |
059dc717baef
(event-modifiers, event-basic-type): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56565
diff
changeset
|
782 EVENT may be an event or an event type. If EVENT is a symbol |
059dc717baef
(event-modifiers, event-basic-type): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56565
diff
changeset
|
783 that has never been used in an event that has been read as input |
059dc717baef
(event-modifiers, event-basic-type): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56565
diff
changeset
|
784 in the current Emacs session, then this function can return nil, |
059dc717baef
(event-modifiers, event-basic-type): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56565
diff
changeset
|
785 even when EVENT actually has modifiers." |
2040
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
786 (let ((type event)) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
787 (if (listp type) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
788 (setq type (car type))) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
789 (if (symbolp type) |
86099
48dc79c663f4
* subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86017
diff
changeset
|
790 ;; Don't read event-symbol-elements directly since we're not |
48dc79c663f4
* subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86017
diff
changeset
|
791 ;; sure the symbol has already been parsed. |
48dc79c663f4
* subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86017
diff
changeset
|
792 (cdr (internal-event-symbol-parse-modifiers type)) |
55013
aba8cece2157
(event-modifiers): Fix the criterion for ASCII control chars.
Richard M. Stallman <rms@gnu.org>
parents:
55008
diff
changeset
|
793 (let ((list nil) |
aba8cece2157
(event-modifiers): Fix the criterion for ASCII control chars.
Richard M. Stallman <rms@gnu.org>
parents:
55008
diff
changeset
|
794 (char (logand type (lognot (logior ?\M-\^@ ?\C-\^@ ?\S-\^@ |
aba8cece2157
(event-modifiers): Fix the criterion for ASCII control chars.
Richard M. Stallman <rms@gnu.org>
parents:
55008
diff
changeset
|
795 ?\H-\^@ ?\s-\^@ ?\A-\^@))))) |
aba8cece2157
(event-modifiers): Fix the criterion for ASCII control chars.
Richard M. Stallman <rms@gnu.org>
parents:
55008
diff
changeset
|
796 (if (not (zerop (logand type ?\M-\^@))) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
797 (push 'meta list)) |
55013
aba8cece2157
(event-modifiers): Fix the criterion for ASCII control chars.
Richard M. Stallman <rms@gnu.org>
parents:
55008
diff
changeset
|
798 (if (or (not (zerop (logand type ?\C-\^@))) |
aba8cece2157
(event-modifiers): Fix the criterion for ASCII control chars.
Richard M. Stallman <rms@gnu.org>
parents:
55008
diff
changeset
|
799 (< char 32)) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
800 (push 'control list)) |
55013
aba8cece2157
(event-modifiers): Fix the criterion for ASCII control chars.
Richard M. Stallman <rms@gnu.org>
parents:
55008
diff
changeset
|
801 (if (or (not (zerop (logand type ?\S-\^@))) |
aba8cece2157
(event-modifiers): Fix the criterion for ASCII control chars.
Richard M. Stallman <rms@gnu.org>
parents:
55008
diff
changeset
|
802 (/= char (downcase char))) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
803 (push 'shift list)) |
10693
0875851842f0
(listify-key-sequence-1, event-modifiers): Don't presume internal bit layout
Karl Heuer <kwzh@gnu.org>
parents:
10681
diff
changeset
|
804 (or (zerop (logand type ?\H-\^@)) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
805 (push 'hyper list)) |
10693
0875851842f0
(listify-key-sequence-1, event-modifiers): Don't presume internal bit layout
Karl Heuer <kwzh@gnu.org>
parents:
10681
diff
changeset
|
806 (or (zerop (logand type ?\s-\^@)) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
807 (push 'super list)) |
10693
0875851842f0
(listify-key-sequence-1, event-modifiers): Don't presume internal bit layout
Karl Heuer <kwzh@gnu.org>
parents:
10681
diff
changeset
|
808 (or (zerop (logand type ?\A-\^@)) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
809 (push 'alt list)) |
2040
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
810 list)))) |
aa926beb4caa
(event-modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2033
diff
changeset
|
811 |
2063
2f0555b428c4
(event-basic-type): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2040
diff
changeset
|
812 (defun event-basic-type (event) |
56537
69db3634588e
(butlast, event-modifiers, event-basic-type): Doc fixes.
John Paul Wallington <jpw@pobox.com>
parents:
56402
diff
changeset
|
813 "Return the basic type of the given event (all modifiers removed). |
56570
059dc717baef
(event-modifiers, event-basic-type): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56565
diff
changeset
|
814 The value is a printing character (not upper case) or a symbol. |
059dc717baef
(event-modifiers, event-basic-type): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56565
diff
changeset
|
815 EVENT may be an event or an event type. If EVENT is a symbol |
059dc717baef
(event-modifiers, event-basic-type): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56565
diff
changeset
|
816 that has never been used in an event that has been read as input |
059dc717baef
(event-modifiers, event-basic-type): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56565
diff
changeset
|
817 in the current Emacs session, then this function may return nil." |
3784
d2df5ca46b39
* subr.el (event-basic-type): Deal with listy events properly.
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
818 (if (consp event) |
d2df5ca46b39
* subr.el (event-basic-type): Deal with listy events properly.
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
819 (setq event (car event))) |
2063
2f0555b428c4
(event-basic-type): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2040
diff
changeset
|
820 (if (symbolp event) |
2f0555b428c4
(event-basic-type): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2040
diff
changeset
|
821 (car (get event 'event-symbol-elements)) |
62524
b54077faa74a
(event-basic-type): Don't get an error.
Richard M. Stallman <rms@gnu.org>
parents:
62501
diff
changeset
|
822 (let* ((base (logand event (1- ?\A-\^@))) |
b54077faa74a
(event-basic-type): Don't get an error.
Richard M. Stallman <rms@gnu.org>
parents:
62501
diff
changeset
|
823 (uncontrolled (if (< base 32) (logior base 64) base))) |
b54077faa74a
(event-basic-type): Don't get an error.
Richard M. Stallman <rms@gnu.org>
parents:
62501
diff
changeset
|
824 ;; There are some numbers that are invalid characters and |
b54077faa74a
(event-basic-type): Don't get an error.
Richard M. Stallman <rms@gnu.org>
parents:
62501
diff
changeset
|
825 ;; cause `downcase' to get an error. |
b54077faa74a
(event-basic-type): Don't get an error.
Richard M. Stallman <rms@gnu.org>
parents:
62501
diff
changeset
|
826 (condition-case () |
b54077faa74a
(event-basic-type): Don't get an error.
Richard M. Stallman <rms@gnu.org>
parents:
62501
diff
changeset
|
827 (downcase uncontrolled) |
b54077faa74a
(event-basic-type): Don't get an error.
Richard M. Stallman <rms@gnu.org>
parents:
62501
diff
changeset
|
828 (error uncontrolled))))) |
2063
2f0555b428c4
(event-basic-type): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2040
diff
changeset
|
829 |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
830 (defsubst mouse-movement-p (object) |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
831 "Return non-nil if OBJECT is a mouse movement event." |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
832 (eq (car-safe object) 'mouse-movement)) |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
833 |
94556
8d02ae7cb729
* vc.el (vc-dir-mode-map): Enable mouse bindings.
Sam Steingold <sds@gnu.org>
parents:
94331
diff
changeset
|
834 (defun mouse-event-p (object) |
8d02ae7cb729
* vc.el (vc-dir-mode-map): Enable mouse bindings.
Sam Steingold <sds@gnu.org>
parents:
94331
diff
changeset
|
835 "Return non-nil if OBJECT is a mouse click event." |
8d02ae7cb729
* vc.el (vc-dir-mode-map): Enable mouse bindings.
Sam Steingold <sds@gnu.org>
parents:
94331
diff
changeset
|
836 ;; is this really correct? maybe remove mouse-movement? |
8d02ae7cb729
* vc.el (vc-dir-mode-map): Enable mouse bindings.
Sam Steingold <sds@gnu.org>
parents:
94331
diff
changeset
|
837 (memq (event-basic-type object) '(mouse-1 mouse-2 mouse-3 mouse-movement))) |
8d02ae7cb729
* vc.el (vc-dir-mode-map): Enable mouse bindings.
Sam Steingold <sds@gnu.org>
parents:
94331
diff
changeset
|
838 |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
839 (defsubst event-start (event) |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
840 "Return the starting position of EVENT. |
54866
47cdc4f7ee17
(posn-set-point): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54626
diff
changeset
|
841 If EVENT is a mouse or key press or a mouse click, this returns the location |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
842 of the event. |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
843 If EVENT is a drag, this returns the drag's starting position. |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
844 The return value is of the form |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
845 (WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW) |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
846 IMAGE (DX . DY) (WIDTH . HEIGHT)) |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
847 The `posn-' functions access elements of such lists." |
45978
a8fbafaa31ad
(event-start, event-end, event-click-count):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45823
diff
changeset
|
848 (if (consp event) (nth 1 event) |
a8fbafaa31ad
(event-start, event-end, event-click-count):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45823
diff
changeset
|
849 (list (selected-window) (point) '(0 . 0) 0))) |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
850 |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
851 (defsubst event-end (event) |
54866
47cdc4f7ee17
(posn-set-point): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54626
diff
changeset
|
852 "Return the ending location of EVENT. |
47cdc4f7ee17
(posn-set-point): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54626
diff
changeset
|
853 EVENT should be a click, drag, or key press event. |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
854 If EVENT is a click event, this function is the same as `event-start'. |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
855 The return value is of the form |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
856 (WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW) |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
857 IMAGE (DX . DY) (WIDTH . HEIGHT)) |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
858 The `posn-' functions access elements of such lists." |
45978
a8fbafaa31ad
(event-start, event-end, event-click-count):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45823
diff
changeset
|
859 (if (consp event) (nth (if (consp (nth 2 event)) 2 1) event) |
a8fbafaa31ad
(event-start, event-end, event-click-count):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45823
diff
changeset
|
860 (list (selected-window) (point) '(0 . 0) 0))) |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
861 |
4414
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
862 (defsubst event-click-count (event) |
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
863 "Return the multi-click count of EVENT, a click or drag event. |
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
864 The return value is a positive integer." |
45978
a8fbafaa31ad
(event-start, event-end, event-click-count):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45823
diff
changeset
|
865 (if (and (consp event) (integerp (nth 2 event))) (nth 2 event) 1)) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
866 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
867 ;;;; Extracting fields of the positions in an event. |
4414
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
868 |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
869 (defsubst posn-window (position) |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
870 "Return the window in POSITION. |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
871 POSITION should be a list of the form returned by the `event-start' |
53593 | 872 and `event-end' functions." |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
873 (nth 0 position)) |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
874 |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
875 (defsubst posn-area (position) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
876 "Return the window area recorded in POSITION, or nil for the text area. |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
877 POSITION should be a list of the form returned by the `event-start' |
53593 | 878 and `event-end' functions." |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
879 (let ((area (if (consp (nth 1 position)) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
880 (car (nth 1 position)) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
881 (nth 1 position)))) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
882 (and (symbolp area) area))) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
883 |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
884 (defsubst posn-point (position) |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
885 "Return the buffer location in POSITION. |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
886 POSITION should be a list of the form returned by the `event-start' |
53593 | 887 and `event-end' functions." |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
888 (or (nth 5 position) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
889 (if (consp (nth 1 position)) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
890 (car (nth 1 position)) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
891 (nth 1 position)))) |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
892 |
54866
47cdc4f7ee17
(posn-set-point): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54626
diff
changeset
|
893 (defun posn-set-point (position) |
47cdc4f7ee17
(posn-set-point): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54626
diff
changeset
|
894 "Move point to POSITION. |
47cdc4f7ee17
(posn-set-point): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54626
diff
changeset
|
895 Select the corresponding window as well." |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
896 (if (not (windowp (posn-window position))) |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
897 (error "Position not in text area of window")) |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
898 (select-window (posn-window position)) |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
899 (if (numberp (posn-point position)) |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
900 (goto-char (posn-point position)))) |
54866
47cdc4f7ee17
(posn-set-point): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54626
diff
changeset
|
901 |
6039
4eb7f4633370
(posn-x-y): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6005
diff
changeset
|
902 (defsubst posn-x-y (position) |
4eb7f4633370
(posn-x-y): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6005
diff
changeset
|
903 "Return the x and y coordinates in POSITION. |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
904 POSITION should be a list of the form returned by the `event-start' |
53593 | 905 and `event-end' functions." |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
906 (nth 2 position)) |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
907 |
95841
b4e36ff621b3
Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents:
95778
diff
changeset
|
908 (declare-function scroll-bar-scale "scroll-bar" (num-denom whole)) |
b4e36ff621b3
Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents:
95778
diff
changeset
|
909 |
7636
83dba60657ef
(posn-col-row): Do something useful for scroll bar event.
Richard M. Stallman <rms@gnu.org>
parents:
7615
diff
changeset
|
910 (defun posn-col-row (position) |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
911 "Return the nominal column and row in POSITION, measured in characters. |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
912 The column and row values are approximations calculated from the x |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
913 and y coordinates in POSITION and the frame's default character width |
53593 | 914 and height. |
7636
83dba60657ef
(posn-col-row): Do something useful for scroll bar event.
Richard M. Stallman <rms@gnu.org>
parents:
7615
diff
changeset
|
915 For a scroll-bar event, the result column is 0, and the row |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
916 corresponds to the vertical position of the click in the scroll bar. |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
917 POSITION should be a list of the form returned by the `event-start' |
53593 | 918 and `event-end' functions." |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
919 (let* ((pair (posn-x-y position)) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
920 (window (posn-window position)) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
921 (area (posn-area position))) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
922 (cond |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
923 ((null window) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
924 '(0 . 0)) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
925 ((eq area 'vertical-scroll-bar) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
926 (cons 0 (scroll-bar-scale pair (1- (window-height window))))) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
927 ((eq area 'horizontal-scroll-bar) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
928 (cons (scroll-bar-scale pair (window-width window)) 0)) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
929 (t |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
930 (let* ((frame (if (framep window) window (window-frame window))) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
931 (x (/ (car pair) (frame-char-width frame))) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
932 (y (/ (cdr pair) (+ (frame-char-height frame) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
933 (or (frame-parameter frame 'line-spacing) |
86341
5a317f281e6c
(posn-col-row): Make the `default-value' use explicit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86221
diff
changeset
|
934 ;; FIXME: Why the `default'? |
5a317f281e6c
(posn-col-row): Make the `default-value' use explicit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86221
diff
changeset
|
935 (default-value 'line-spacing) |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
936 0))))) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
937 (cons x y)))))) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
938 |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
939 (defun posn-actual-col-row (position) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
940 "Return the actual column and row in POSITION, measured in characters. |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
941 These are the actual row number in the window and character number in that row. |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
942 Return nil if POSITION does not contain the actual position; in that case |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
943 `posn-col-row' can be used to get approximate values. |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
944 POSITION should be a list of the form returned by the `event-start' |
53593 | 945 and `event-end' functions." |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
946 (nth 6 position)) |
6039
4eb7f4633370
(posn-x-y): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6005
diff
changeset
|
947 |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
948 (defsubst posn-timestamp (position) |
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
949 "Return the timestamp of POSITION. |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
950 POSITION should be a list of the form returned by the `event-start' |
53593 | 951 and `event-end' functions." |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
952 (nth 3 position)) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
953 |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
954 (defsubst posn-string (position) |
70229
b85aa1663ba3
(posn-string, posn-image, posn-object): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
69978
diff
changeset
|
955 "Return the string object of POSITION. |
b85aa1663ba3
(posn-string, posn-image, posn-object): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
69978
diff
changeset
|
956 Value is a cons (STRING . STRING-POS), or nil if not a string. |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
957 POSITION should be a list of the form returned by the `event-start' |
53593 | 958 and `event-end' functions." |
53132
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
959 (nth 4 position)) |
20c6299bd4df
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53063
diff
changeset
|
960 |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
961 (defsubst posn-image (position) |
70229
b85aa1663ba3
(posn-string, posn-image, posn-object): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
69978
diff
changeset
|
962 "Return the image object of POSITION. |
74085
7e5dd39ae47d
(posn-image): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
73943
diff
changeset
|
963 Value is a list (image ...), or nil if not an image. |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
964 POSITION should be a list of the form returned by the `event-start' |
53593 | 965 and `event-end' functions." |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
966 (nth 7 position)) |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
967 |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
968 (defsubst posn-object (position) |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
969 "Return the object (image or string) of POSITION. |
70229
b85aa1663ba3
(posn-string, posn-image, posn-object): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
69978
diff
changeset
|
970 Value is a list (image ...) for an image object, a cons cell |
b85aa1663ba3
(posn-string, posn-image, posn-object): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
69978
diff
changeset
|
971 \(STRING . STRING-POS) for a string object, and nil for a buffer position. |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
972 POSITION should be a list of the form returned by the `event-start' |
53593 | 973 and `event-end' functions." |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
974 (or (posn-image position) (posn-string position))) |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
975 |
53181
8337e648c2b3
(posn-object-x-y): New defun.
Kim F. Storm <storm@cua.dk>
parents:
53174
diff
changeset
|
976 (defsubst posn-object-x-y (position) |
8337e648c2b3
(posn-object-x-y): New defun.
Kim F. Storm <storm@cua.dk>
parents:
53174
diff
changeset
|
977 "Return the x and y coordinates relative to the object of POSITION. |
8337e648c2b3
(posn-object-x-y): New defun.
Kim F. Storm <storm@cua.dk>
parents:
53174
diff
changeset
|
978 POSITION should be a list of the form returned by the `event-start' |
53593 | 979 and `event-end' functions." |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
980 (nth 8 position)) |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
981 |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
982 (defsubst posn-object-width-height (position) |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
983 "Return the pixel width and height of the object of POSITION. |
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
984 POSITION should be a list of the form returned by the `event-start' |
53593 | 985 and `event-end' functions." |
53518
21599196e26a
(event-start, event-end): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
53485
diff
changeset
|
986 (nth 9 position)) |
53181
8337e648c2b3
(posn-object-x-y): New defun.
Kim F. Storm <storm@cua.dk>
parents:
53174
diff
changeset
|
987 |
2071
8f410f56d98f
(posn-timestamp, posn-col-row, posn-point, posn-window):
Richard M. Stallman <rms@gnu.org>
parents:
2063
diff
changeset
|
988 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
989 ;;;; Obsolescent names for functions. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
990 |
62542
3f80c5cf6771
(send-string, send-region): Remove obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
62524
diff
changeset
|
991 (define-obsolete-function-alias 'window-dot 'window-point "22.1") |
3f80c5cf6771
(send-string, send-region): Remove obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
62524
diff
changeset
|
992 (define-obsolete-function-alias 'set-window-dot 'set-window-point "22.1") |
3f80c5cf6771
(send-string, send-region): Remove obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
62524
diff
changeset
|
993 (define-obsolete-function-alias 'read-input 'read-string "22.1") |
3f80c5cf6771
(send-string, send-region): Remove obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
62524
diff
changeset
|
994 (define-obsolete-function-alias 'show-buffer 'set-window-buffer "22.1") |
3f80c5cf6771
(send-string, send-region): Remove obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
62524
diff
changeset
|
995 (define-obsolete-function-alias 'eval-current-buffer 'eval-buffer "22.1") |
3f80c5cf6771
(send-string, send-region): Remove obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
62524
diff
changeset
|
996 (define-obsolete-function-alias 'string-to-int 'string-to-number "22.1") |
114 | 997 |
47652
a5316596929f
(read-key-auxiliary-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47406
diff
changeset
|
998 (make-obsolete 'char-bytes "now always returns 1." "20.4") |
20605 | 999 |
42266
75bbe9d566d9
(insert-string): Moved from mocklisp.c, reimplemented in Lisp. Obsoleted.
Pavel Janík <Pavel@Janik.cz>
parents:
42083
diff
changeset
|
1000 (defun insert-string (&rest args) |
75bbe9d566d9
(insert-string): Moved from mocklisp.c, reimplemented in Lisp. Obsoleted.
Pavel Janík <Pavel@Janik.cz>
parents:
42083
diff
changeset
|
1001 "Mocklisp-compatibility insert function. |
75bbe9d566d9
(insert-string): Moved from mocklisp.c, reimplemented in Lisp. Obsoleted.
Pavel Janík <Pavel@Janik.cz>
parents:
42083
diff
changeset
|
1002 Like the function `insert' except that any argument that is a number |
75bbe9d566d9
(insert-string): Moved from mocklisp.c, reimplemented in Lisp. Obsoleted.
Pavel Janík <Pavel@Janik.cz>
parents:
42083
diff
changeset
|
1003 is converted into a string by expressing it in decimal." |
75bbe9d566d9
(insert-string): Moved from mocklisp.c, reimplemented in Lisp. Obsoleted.
Pavel Janík <Pavel@Janik.cz>
parents:
42083
diff
changeset
|
1004 (dolist (el args) |
75bbe9d566d9
(insert-string): Moved from mocklisp.c, reimplemented in Lisp. Obsoleted.
Pavel Janík <Pavel@Janik.cz>
parents:
42083
diff
changeset
|
1005 (insert (if (integerp el) (number-to-string el) el)))) |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59648
diff
changeset
|
1006 (make-obsolete 'insert-string 'insert "22.1") |
62430
a25a4c4602a4
Slight reorganization of some obsolete declarations; deleted comment no longer
Juanma Barranquero <lekktu@gmail.com>
parents:
62380
diff
changeset
|
1007 |
46219
56b79cbf05d2
(insert-string): Update the obsolete info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46148
diff
changeset
|
1008 (defun makehash (&optional test) (make-hash-table :test (or test 'eql))) |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59648
diff
changeset
|
1009 (make-obsolete 'makehash 'make-hash-table "22.1") |
42266
75bbe9d566d9
(insert-string): Moved from mocklisp.c, reimplemented in Lisp. Obsoleted.
Pavel Janík <Pavel@Janik.cz>
parents:
42083
diff
changeset
|
1010 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1011 ;; Some programs still use this as a function. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1012 (defun baud-rate () |
46052
4d27fe417297
(char-bytes): Fix obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
45978
diff
changeset
|
1013 "Return the value of the `baud-rate' variable." |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1014 baud-rate) |
62430
a25a4c4602a4
Slight reorganization of some obsolete declarations; deleted comment no longer
Juanma Barranquero <lekktu@gmail.com>
parents:
62380
diff
changeset
|
1015 (make-obsolete 'baud-rate "use the `baud-rate' variable instead." "before 19.15") |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1016 |
62608
ad7518f065e5
(focus-frame, unfocus-frame): Revert deletion on 2005-05-01.
Juanma Barranquero <lekktu@gmail.com>
parents:
62542
diff
changeset
|
1017 ;; These are used by VM and some old programs |
ad7518f065e5
(focus-frame, unfocus-frame): Revert deletion on 2005-05-01.
Juanma Barranquero <lekktu@gmail.com>
parents:
62542
diff
changeset
|
1018 (defalias 'focus-frame 'ignore "") |
ad7518f065e5
(focus-frame, unfocus-frame): Revert deletion on 2005-05-01.
Juanma Barranquero <lekktu@gmail.com>
parents:
62542
diff
changeset
|
1019 (make-obsolete 'focus-frame "it does nothing." "22.1") |
ad7518f065e5
(focus-frame, unfocus-frame): Revert deletion on 2005-05-01.
Juanma Barranquero <lekktu@gmail.com>
parents:
62542
diff
changeset
|
1020 (defalias 'unfocus-frame 'ignore "") |
ad7518f065e5
(focus-frame, unfocus-frame): Revert deletion on 2005-05-01.
Juanma Barranquero <lekktu@gmail.com>
parents:
62542
diff
changeset
|
1021 (make-obsolete 'unfocus-frame "it does nothing." "22.1") |
79437
a5f9f96b8f89
(make-variable-frame-local): Fix typo in obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
79186
diff
changeset
|
1022 (make-obsolete 'make-variable-frame-local "use a frame-parameter instead." "22.2") |
46537
46f175ecf5d4
(unread-command-char, executing-macro, post-command-idle-hook,
Juanma Barranquero <lekktu@gmail.com>
parents:
46532
diff
changeset
|
1023 |
59124
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1024 ;;;; Obsolescence declarations for variables, and aliases. |
46537
46f175ecf5d4
(unread-command-char, executing-macro, post-command-idle-hook,
Juanma Barranquero <lekktu@gmail.com>
parents:
46532
diff
changeset
|
1025 |
93200
c264aa814b15
(redisplay-end-trigger-functions, window-redisplay-end-trigger)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92948
diff
changeset
|
1026 (make-obsolete-variable 'redisplay-end-trigger-functions 'jit-lock-register "23.1") |
c264aa814b15
(redisplay-end-trigger-functions, window-redisplay-end-trigger)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92948
diff
changeset
|
1027 (make-obsolete 'window-redisplay-end-trigger nil "23.1") |
c264aa814b15
(redisplay-end-trigger-functions, window-redisplay-end-trigger)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92948
diff
changeset
|
1028 (make-obsolete 'set-window-redisplay-end-trigger nil "23.1") |
c264aa814b15
(redisplay-end-trigger-functions, window-redisplay-end-trigger)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92948
diff
changeset
|
1029 |
c264aa814b15
(redisplay-end-trigger-functions, window-redisplay-end-trigger)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92948
diff
changeset
|
1030 (make-obsolete 'process-filter-multibyte-p nil "23.1") |
c264aa814b15
(redisplay-end-trigger-functions, window-redisplay-end-trigger)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92948
diff
changeset
|
1031 (make-obsolete 'set-process-filter-multibyte nil "23.1") |
c264aa814b15
(redisplay-end-trigger-functions, window-redisplay-end-trigger)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92948
diff
changeset
|
1032 |
46537
46f175ecf5d4
(unread-command-char, executing-macro, post-command-idle-hook,
Juanma Barranquero <lekktu@gmail.com>
parents:
46532
diff
changeset
|
1033 (make-obsolete-variable 'directory-sep-char "do not use it." "21.1") |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1034 (make-obsolete-variable |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1035 'mode-line-inverse-video |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1036 "use the appropriate faces instead." |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1037 "21.1") |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1038 (make-obsolete-variable |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1039 'unread-command-char |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1040 "use `unread-command-events' instead. That variable is a list of events |
74597
ee63ac76eb51
(unread-command-char): Reflow obsolescence info.
Juanma Barranquero <lekktu@gmail.com>
parents:
74242
diff
changeset
|
1041 to reread, so it now uses nil to mean `no event', instead of -1." |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1042 "before 19.15") |
46537
46f175ecf5d4
(unread-command-char, executing-macro, post-command-idle-hook,
Juanma Barranquero <lekktu@gmail.com>
parents:
46532
diff
changeset
|
1043 |
62015
e208ebaf0e17
(executing-macro): Use `define-obsolete-variable-alias'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61996
diff
changeset
|
1044 ;; Lisp manual only updated in 22.1. |
e208ebaf0e17
(executing-macro): Use `define-obsolete-variable-alias'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61996
diff
changeset
|
1045 (define-obsolete-variable-alias 'executing-macro 'executing-kbd-macro |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1046 "before 19.34") |
62015
e208ebaf0e17
(executing-macro): Use `define-obsolete-variable-alias'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61996
diff
changeset
|
1047 |
57778
82ed9ce364a7
(x-lost-selection-hooks, x-sent-selection-hooks): New obsolete aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57689
diff
changeset
|
1048 (defvaralias 'x-lost-selection-hooks 'x-lost-selection-functions) |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1049 (make-obsolete-variable 'x-lost-selection-hooks |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1050 'x-lost-selection-functions "22.1") |
57778
82ed9ce364a7
(x-lost-selection-hooks, x-sent-selection-hooks): New obsolete aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57689
diff
changeset
|
1051 (defvaralias 'x-sent-selection-hooks 'x-sent-selection-functions) |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1052 (make-obsolete-variable 'x-sent-selection-hooks |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1053 'x-sent-selection-functions "22.1") |
94331
6d85304f4f12
(translation-table-for-input): Mark as obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94183
diff
changeset
|
1054 ;; This was introduced in 21.4 for pre-unicode unification and was rendered |
6d85304f4f12
(translation-table-for-input): Mark as obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94183
diff
changeset
|
1055 ;; obsolete by the use of Unicode internally in 23.1. |
6d85304f4f12
(translation-table-for-input): Mark as obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94183
diff
changeset
|
1056 (make-obsolete-variable 'translation-table-for-input nil "23.1") |
59124
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1057 |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1058 (defvaralias 'messages-buffer-max-lines 'message-log-max) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1059 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1060 ;;;; Alternate names for functions - these are not being phased out. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1061 |
62542
3f80c5cf6771
(send-string, send-region): Remove obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
62524
diff
changeset
|
1062 (defalias 'send-string 'process-send-string) |
3f80c5cf6771
(send-string, send-region): Remove obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
62524
diff
changeset
|
1063 (defalias 'send-region 'process-send-region) |
2569
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1064 (defalias 'string= 'string-equal) |
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1065 (defalias 'string< 'string-lessp) |
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1066 (defalias 'move-marker 'set-marker) |
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1067 (defalias 'rplaca 'setcar) |
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1068 (defalias 'rplacd 'setcdr) |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3411
diff
changeset
|
1069 (defalias 'beep 'ding) ;preserve lingual purity |
2569
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1070 (defalias 'indent-to-column 'indent-to) |
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1071 (defalias 'backward-delete-char 'delete-backward-char) |
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1072 (defalias 'search-forward-regexp (symbol-function 're-search-forward)) |
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1073 (defalias 'search-backward-regexp (symbol-function 're-search-backward)) |
39ad4eda7fea
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2504
diff
changeset
|
1074 (defalias 'int-to-string 'number-to-string) |
21173
e917eb0d4e01
(save-match-data): store-match-data => set-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
21092
diff
changeset
|
1075 (defalias 'store-match-data 'set-match-data) |
31563
96b9757bfd45
(add-minor-mode): Use toggle-fun arg.
Dave Love <fx@gnu.org>
parents:
30515
diff
changeset
|
1076 ;; These are the XEmacs names: |
25293
fd43e1a99384
(point-at-eol, point-at-bol): New aliases.
Karl Heuer <kwzh@gnu.org>
parents:
25140
diff
changeset
|
1077 (defalias 'point-at-eol 'line-end-position) |
fd43e1a99384
(point-at-eol, point-at-bol): New aliases.
Karl Heuer <kwzh@gnu.org>
parents:
25140
diff
changeset
|
1078 (defalias 'point-at-bol 'line-beginning-position) |
1903
87f63305319f
* subr.el (string-to-int): Make this an alias for
Jim Blandy <jimb@redhat.com>
parents:
1867
diff
changeset
|
1079 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1080 (defalias 'user-original-login-name 'user-login-name) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1081 |
114 | 1082 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1083 ;;;; Hook manipulation functions. |
388 | 1084 |
9195
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1085 (defun make-local-hook (hook) |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1086 "Make the hook HOOK local to the current buffer. |
23786
673204d56938
(make-local-hook): Return the hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
23736
diff
changeset
|
1087 The return value is HOOK. |
673204d56938
(make-local-hook): Return the hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
23736
diff
changeset
|
1088 |
33707
2b9847c18f31
(make-local-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32355
diff
changeset
|
1089 You never need to call this function now that `add-hook' does it for you |
2b9847c18f31
(make-local-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32355
diff
changeset
|
1090 if its LOCAL argument is non-nil. |
2b9847c18f31
(make-local-hook): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32355
diff
changeset
|
1091 |
9195
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1092 When a hook is local, its local and global values |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1093 work in concert: running the hook actually runs all the hook |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1094 functions listed in *either* the local value *or* the global value |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1095 of the hook variable. |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1096 |
39557
fb85410efef7
(define-key-after): Allow `key' to be longer than 1.
Gerd Moellmann <gerd@gnu.org>
parents:
38760
diff
changeset
|
1097 This function works by making t a member of the buffer-local value, |
12258
95ebca0a74d8
(make-local-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12108
diff
changeset
|
1098 which acts as a flag to run the hook functions in the default value as |
95ebca0a74d8
(make-local-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12108
diff
changeset
|
1099 well. This works for all normal hooks, but does not work for most |
95ebca0a74d8
(make-local-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12108
diff
changeset
|
1100 non-normal hooks yet. We will be changing the callers of non-normal |
95ebca0a74d8
(make-local-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12108
diff
changeset
|
1101 hooks so that they can handle localness; this has to be done one by |
95ebca0a74d8
(make-local-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12108
diff
changeset
|
1102 one. |
95ebca0a74d8
(make-local-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12108
diff
changeset
|
1103 |
95ebca0a74d8
(make-local-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12108
diff
changeset
|
1104 This function does nothing if HOOK is already local in the current |
95ebca0a74d8
(make-local-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12108
diff
changeset
|
1105 buffer. |
9195
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1106 |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1107 Do not use `make-local-variable' to make a hook variable buffer-local." |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1108 (if (local-variable-p hook) |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1109 nil |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1110 (or (boundp hook) (set hook nil)) |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1111 (make-local-variable hook) |
23786
673204d56938
(make-local-hook): Return the hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
23736
diff
changeset
|
1112 (set hook (list t))) |
673204d56938
(make-local-hook): Return the hook variable.
Richard M. Stallman <rms@gnu.org>
parents:
23736
diff
changeset
|
1113 hook) |
46052
4d27fe417297
(char-bytes): Fix obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
45978
diff
changeset
|
1114 (make-obsolete 'make-local-hook "not necessary any more." "21.1") |
9195
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1115 |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1116 (defun add-hook (hook function &optional append local) |
4414
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
1117 "Add to the value of HOOK the function FUNCTION. |
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
1118 FUNCTION is not added if already present. |
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
1119 FUNCTION is added (if necessary) at the beginning of the hook list |
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
1120 unless the optional argument APPEND is non-nil, in which case |
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
1121 FUNCTION is added at the end. |
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
1122 |
9195
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1123 The optional fourth argument, LOCAL, if non-nil, says to modify |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1124 the hook's buffer-local value rather than its default value. |
43435 | 1125 This makes the hook buffer-local if needed, and it makes t a member |
1126 of the buffer-local value. That acts as a flag to run the hook | |
1127 functions in the default value as well as in the local value. | |
9195
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1128 |
4414
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
1129 HOOK should be a symbol, and FUNCTION may be any valid function. If |
3356419b94c1
(add-hook): Change a single function into a list.
Richard M. Stallman <rms@gnu.org>
parents:
4235
diff
changeset
|
1130 HOOK is void, it is first set to nil. If HOOK's value is a single |
8959
d33302427a47
(remove-hook, add-hook): Copy existing list before modifying.
Richard M. Stallman <rms@gnu.org>
parents:
8928
diff
changeset
|
1131 function, it is changed to a list of functions." |
114 | 1132 (or (boundp hook) (set hook nil)) |
9195
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1133 (or (default-boundp hook) (set-default hook nil)) |
39557
fb85410efef7
(define-key-after): Allow `key' to be longer than 1.
Gerd Moellmann <gerd@gnu.org>
parents:
38760
diff
changeset
|
1134 (if local (unless (local-variable-if-set-p hook) |
fb85410efef7
(define-key-after): Allow `key' to be longer than 1.
Gerd Moellmann <gerd@gnu.org>
parents:
38760
diff
changeset
|
1135 (set (make-local-variable hook) (list t))) |
28863
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1136 ;; Detect the case where make-local-variable was used on a hook |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1137 ;; and do what we used to do. |
52987
ac21698ba968
(add-hook): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52896
diff
changeset
|
1138 (unless (and (consp (symbol-value hook)) (memq t (symbol-value hook))) |
28863
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1139 (setq local t))) |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1140 (let ((hook-value (if local (symbol-value hook) (default-value hook)))) |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1141 ;; If the hook value is a single function, turn it into a list. |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1142 (when (or (not (listp hook-value)) (eq (car hook-value) 'lambda)) |
28940
2a91228f7aa3
(add-hook): setq hook-value, not set
Sam Steingold <sds@gnu.org>
parents:
28868
diff
changeset
|
1143 (setq hook-value (list hook-value))) |
28863
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1144 ;; Do the actual addition if necessary |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1145 (unless (member function hook-value) |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1146 (setq hook-value |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1147 (if append |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1148 (append hook-value (list function)) |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1149 (cons function hook-value)))) |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1150 ;; Set the actual variable |
87974
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1151 (if local |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1152 (progn |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1153 ;; If HOOK isn't a permanent local, |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1154 ;; but FUNCTION wants to survive a change of modes, |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1155 ;; mark HOOK as partially permanent. |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1156 (and (symbolp function) |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1157 (get function 'permanent-local-hook) |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1158 (not (get hook 'permanent-local)) |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1159 (put hook 'permanent-local 'permanent-local-hook)) |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1160 (set hook hook-value)) |
97c3cc0a167b
(add-hook): Implement `permanent-local-hook' property.
Richard M. Stallman <rms@gnu.org>
parents:
87903
diff
changeset
|
1161 (set-default hook hook-value)))) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1162 |
9195
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1163 (defun remove-hook (hook function &optional local) |
4964
78c13f3054e5
(remove-hook): New function, analogous to add-hook. This
Richard M. Stallman <rms@gnu.org>
parents:
4767
diff
changeset
|
1164 "Remove from the value of HOOK the function FUNCTION. |
78c13f3054e5
(remove-hook): New function, analogous to add-hook. This
Richard M. Stallman <rms@gnu.org>
parents:
4767
diff
changeset
|
1165 HOOK should be a symbol, and FUNCTION may be any valid function. If |
78c13f3054e5
(remove-hook): New function, analogous to add-hook. This
Richard M. Stallman <rms@gnu.org>
parents:
4767
diff
changeset
|
1166 FUNCTION isn't the value of HOOK, or, if FUNCTION doesn't appear in the |
9195
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1167 list of hooks to run in HOOK, then nothing is done. See `add-hook'. |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1168 |
70b00615cb75
(add-hook): Initialize default value and local value.
Richard M. Stallman <rms@gnu.org>
parents:
8959
diff
changeset
|
1169 The optional third argument, LOCAL, if non-nil, says to modify |
52896
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1170 the hook's buffer-local value rather than its default value." |
28863
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1171 (or (boundp hook) (set hook nil)) |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1172 (or (default-boundp hook) (set-default hook nil)) |
52896
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1173 ;; Do nothing if LOCAL is t but this hook has no local binding. |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1174 (unless (and local (not (local-variable-p hook))) |
28863
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1175 ;; Detect the case where make-local-variable was used on a hook |
6430ce03c28a
(add-hook, remove-hook): Make hook buffer-local if needed..
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28811
diff
changeset
|
1176 ;; and do what we used to do. |
52896
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1177 (when (and (local-variable-p hook) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1178 (not (and (consp (symbol-value hook)) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1179 (memq t (symbol-value hook))))) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1180 (setq local t)) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1181 (let ((hook-value (if local (symbol-value hook) (default-value hook)))) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1182 ;; Remove the function, for both the list and the non-list cases. |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1183 (if (or (not (listp hook-value)) (eq (car hook-value) 'lambda)) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1184 (if (equal hook-value function) (setq hook-value nil)) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1185 (setq hook-value (delete function (copy-sequence hook-value)))) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1186 ;; If the function is on the global hook, we need to shadow it locally |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1187 ;;(when (and local (member function (default-value hook)) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1188 ;; (not (member (cons 'not function) hook-value))) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1189 ;; (push (cons 'not function) hook-value)) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1190 ;; Set the actual variable |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1191 (if (not local) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1192 (set-default hook hook-value) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1193 (if (equal hook-value '(t)) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1194 (kill-local-variable hook) |
f992824e67f0
(add-hook): Correctly detect when make-local-hook was used.
Richard M. Stallman <rms@gnu.org>
parents:
52858
diff
changeset
|
1195 (set hook hook-value)))))) |
9510
f03544494d1c
(add-to-list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9202
diff
changeset
|
1196 |
72784
3f19250c6e68
(add-to-list): New argument COMPARE-FN.
Richard M. Stallman <rms@gnu.org>
parents:
72138
diff
changeset
|
1197 (defun add-to-list (list-var element &optional append compare-fn) |
63797
7f964f8f5c85
(add-to-list, add-to-ordered-list): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63761
diff
changeset
|
1198 "Add ELEMENT to the value of LIST-VAR if it isn't there yet. |
72784
3f19250c6e68
(add-to-list): New argument COMPARE-FN.
Richard M. Stallman <rms@gnu.org>
parents:
72138
diff
changeset
|
1199 The test for presence of ELEMENT is done with `equal', |
3f19250c6e68
(add-to-list): New argument COMPARE-FN.
Richard M. Stallman <rms@gnu.org>
parents:
72138
diff
changeset
|
1200 or with COMPARE-FN if that's non-nil. |
32355
6bf2ae19e286
(add-to-list): Add optional argument APPEND.
Miles Bader <miles@gnu.org>
parents:
32131
diff
changeset
|
1201 If ELEMENT is added, it is added at the beginning of the list, |
6bf2ae19e286
(add-to-list): Add optional argument APPEND.
Miles Bader <miles@gnu.org>
parents:
32131
diff
changeset
|
1202 unless the optional argument APPEND is non-nil, in which case |
6bf2ae19e286
(add-to-list): Add optional argument APPEND.
Miles Bader <miles@gnu.org>
parents:
32131
diff
changeset
|
1203 ELEMENT is added at the end. |
24757
f4127409d184
(add-to-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
24699
diff
changeset
|
1204 |
43833 | 1205 The return value is the new value of LIST-VAR. |
1206 | |
9535 | 1207 If you want to use `add-to-list' on a variable that is not defined |
1208 until a certain package is loaded, you should put the call to `add-to-list' | |
1209 into a hook function that will be run only after loading the package. | |
1210 `eval-after-load' provides one way to do this. In some cases | |
1211 other hooks, such as major mode hooks, can do the job." | |
73465
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1212 (if (cond |
73466
c470e5e21c36
(add-to-list): Fix last change--optimize for no compare-fn.
Kim F. Storm <storm@cua.dk>
parents:
73465
diff
changeset
|
1213 ((null compare-fn) |
c470e5e21c36
(add-to-list): Fix last change--optimize for no compare-fn.
Kim F. Storm <storm@cua.dk>
parents:
73465
diff
changeset
|
1214 (member element (symbol-value list-var))) |
73465
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1215 ((eq compare-fn 'eq) |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1216 (memq element (symbol-value list-var))) |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1217 ((eq compare-fn 'eql) |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1218 (memql element (symbol-value list-var))) |
73466
c470e5e21c36
(add-to-list): Fix last change--optimize for no compare-fn.
Kim F. Storm <storm@cua.dk>
parents:
73465
diff
changeset
|
1219 (t |
73555
3f351640d09f
(add-to-list): Don't continue checking if a match has
David Kastrup <dak@gnu.org>
parents:
73466
diff
changeset
|
1220 (let ((lst (symbol-value list-var))) |
3f351640d09f
(add-to-list): Don't continue checking if a match has
David Kastrup <dak@gnu.org>
parents:
73466
diff
changeset
|
1221 (while (and lst |
3f351640d09f
(add-to-list): Don't continue checking if a match has
David Kastrup <dak@gnu.org>
parents:
73466
diff
changeset
|
1222 (not (funcall compare-fn element (car lst)))) |
3f351640d09f
(add-to-list): Don't continue checking if a match has
David Kastrup <dak@gnu.org>
parents:
73466
diff
changeset
|
1223 (setq lst (cdr lst))) |
3f351640d09f
(add-to-list): Don't continue checking if a match has
David Kastrup <dak@gnu.org>
parents:
73466
diff
changeset
|
1224 lst))) |
21409
3e8b7782f4f5
(add-to-list): Always return updated value of LIST-VAR.
Karl Heuer <kwzh@gnu.org>
parents:
21173
diff
changeset
|
1225 (symbol-value list-var) |
32355
6bf2ae19e286
(add-to-list): Add optional argument APPEND.
Miles Bader <miles@gnu.org>
parents:
32131
diff
changeset
|
1226 (set list-var |
6bf2ae19e286
(add-to-list): Add optional argument APPEND.
Miles Bader <miles@gnu.org>
parents:
32131
diff
changeset
|
1227 (if append |
6bf2ae19e286
(add-to-list): Add optional argument APPEND.
Miles Bader <miles@gnu.org>
parents:
32131
diff
changeset
|
1228 (append (symbol-value list-var) (list element)) |
6bf2ae19e286
(add-to-list): Add optional argument APPEND.
Miles Bader <miles@gnu.org>
parents:
32131
diff
changeset
|
1229 (cons element (symbol-value list-var)))))) |
39725
c64d3e3adf5d
(symbol-file-load-history-loaded)
Miles Bader <miles@gnu.org>
parents:
39598
diff
changeset
|
1230 |
63387
5b9f98f257f8
(add-to-ordered-list): New defun.
Kim F. Storm <storm@cua.dk>
parents:
63381
diff
changeset
|
1231 |
5b9f98f257f8
(add-to-ordered-list): New defun.
Kim F. Storm <storm@cua.dk>
parents:
63381
diff
changeset
|
1232 (defun add-to-ordered-list (list-var element &optional order) |
63797
7f964f8f5c85
(add-to-list, add-to-ordered-list): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63761
diff
changeset
|
1233 "Add ELEMENT to the value of LIST-VAR if it isn't there yet. |
63605
99743da5284f
(add-to-ordered-list): Test membership with eq. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
63472
diff
changeset
|
1234 The test for presence of ELEMENT is done with `eq'. |
63387
5b9f98f257f8
(add-to-ordered-list): New defun.
Kim F. Storm <storm@cua.dk>
parents:
63381
diff
changeset
|
1235 |
5b9f98f257f8
(add-to-ordered-list): New defun.
Kim F. Storm <storm@cua.dk>
parents:
63381
diff
changeset
|
1236 The resulting list is reordered so that the elements are in the |
63605
99743da5284f
(add-to-ordered-list): Test membership with eq. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
63472
diff
changeset
|
1237 order given by each element's numeric list order. Elements |
99743da5284f
(add-to-ordered-list): Test membership with eq. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
63472
diff
changeset
|
1238 without a numeric list order are placed at the end of the list. |
63387
5b9f98f257f8
(add-to-ordered-list): New defun.
Kim F. Storm <storm@cua.dk>
parents:
63381
diff
changeset
|
1239 |
63797
7f964f8f5c85
(add-to-list, add-to-ordered-list): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63761
diff
changeset
|
1240 If the third optional argument ORDER is a number (integer or |
7f964f8f5c85
(add-to-list, add-to-ordered-list): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63761
diff
changeset
|
1241 float), set the element's list order to the given value. If |
7f964f8f5c85
(add-to-list, add-to-ordered-list): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63761
diff
changeset
|
1242 ORDER is nil or omitted, do not change the numeric order of |
7f964f8f5c85
(add-to-list, add-to-ordered-list): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63761
diff
changeset
|
1243 ELEMENT. If ORDER has any other value, remove the numeric order |
7f964f8f5c85
(add-to-list, add-to-ordered-list): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63761
diff
changeset
|
1244 of ELEMENT if it has one. |
63396
18169bc4f438
(add-to-ordered-list): Rework to use list-order property of list-var.
Kim F. Storm <storm@cua.dk>
parents:
63387
diff
changeset
|
1245 |
63472
a89b059224fb
(add-to-ordered-list): Use a weak hash-table to avoid leaks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63396
diff
changeset
|
1246 The list order for each element is stored in LIST-VAR's |
63396
18169bc4f438
(add-to-ordered-list): Rework to use list-order property of list-var.
Kim F. Storm <storm@cua.dk>
parents:
63387
diff
changeset
|
1247 `list-order' property. |
63387
5b9f98f257f8
(add-to-ordered-list): New defun.
Kim F. Storm <storm@cua.dk>
parents:
63381
diff
changeset
|
1248 |
5b9f98f257f8
(add-to-ordered-list): New defun.
Kim F. Storm <storm@cua.dk>
parents:
63381
diff
changeset
|
1249 The return value is the new value of LIST-VAR." |
63472
a89b059224fb
(add-to-ordered-list): Use a weak hash-table to avoid leaks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63396
diff
changeset
|
1250 (let ((ordering (get list-var 'list-order))) |
a89b059224fb
(add-to-ordered-list): Use a weak hash-table to avoid leaks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63396
diff
changeset
|
1251 (unless ordering |
a89b059224fb
(add-to-ordered-list): Use a weak hash-table to avoid leaks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63396
diff
changeset
|
1252 (put list-var 'list-order |
a89b059224fb
(add-to-ordered-list): Use a weak hash-table to avoid leaks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63396
diff
changeset
|
1253 (setq ordering (make-hash-table :weakness 'key :test 'eq)))) |
63396
18169bc4f438
(add-to-ordered-list): Rework to use list-order property of list-var.
Kim F. Storm <storm@cua.dk>
parents:
63387
diff
changeset
|
1254 (when order |
63605
99743da5284f
(add-to-ordered-list): Test membership with eq. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
63472
diff
changeset
|
1255 (puthash element (and (numberp order) order) ordering)) |
99743da5284f
(add-to-ordered-list): Test membership with eq. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
63472
diff
changeset
|
1256 (unless (memq element (symbol-value list-var)) |
99743da5284f
(add-to-ordered-list): Test membership with eq. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
63472
diff
changeset
|
1257 (set list-var (cons element (symbol-value list-var)))) |
63396
18169bc4f438
(add-to-ordered-list): Rework to use list-order property of list-var.
Kim F. Storm <storm@cua.dk>
parents:
63387
diff
changeset
|
1258 (set list-var (sort (symbol-value list-var) |
18169bc4f438
(add-to-ordered-list): Rework to use list-order property of list-var.
Kim F. Storm <storm@cua.dk>
parents:
63387
diff
changeset
|
1259 (lambda (a b) |
63472
a89b059224fb
(add-to-ordered-list): Use a weak hash-table to avoid leaks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63396
diff
changeset
|
1260 (let ((oa (gethash a ordering)) |
a89b059224fb
(add-to-ordered-list): Use a weak hash-table to avoid leaks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63396
diff
changeset
|
1261 (ob (gethash b ordering))) |
63605
99743da5284f
(add-to-ordered-list): Test membership with eq. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
63472
diff
changeset
|
1262 (if (and oa ob) |
99743da5284f
(add-to-ordered-list): Test membership with eq. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
63472
diff
changeset
|
1263 (< oa ob) |
99743da5284f
(add-to-ordered-list): Test membership with eq. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
63472
diff
changeset
|
1264 oa))))))) |
70415
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1265 |
70678
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1266 (defun add-to-history (history-var newelt &optional maxelt keep-all) |
70415
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1267 "Add NEWELT to the history list stored in the variable HISTORY-VAR. |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1268 Return the new history list. |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1269 If MAXELT is non-nil, it specifies the maximum length of the history. |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1270 Otherwise, the maximum history length is the value of the `history-length' |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1271 property on symbol HISTORY-VAR, if set, or the value of the `history-length' |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1272 variable. |
70678
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1273 Remove duplicates of NEWELT if `history-delete-duplicates' is non-nil. |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1274 If optional fourth arg KEEP-ALL is non-nil, add NEWELT to history even |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1275 if it is empty or a duplicate." |
70415
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1276 (unless maxelt |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1277 (setq maxelt (or (get history-var 'history-length) |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1278 history-length))) |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1279 (let ((history (symbol-value history-var)) |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1280 tail) |
70678
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1281 (when (and (listp history) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1282 (or keep-all |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1283 (not (stringp newelt)) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1284 (> (length newelt) 0)) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1285 (or keep-all |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1286 (not (equal (car history) newelt)))) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1287 (if history-delete-duplicates |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1288 (delete newelt history)) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1289 (setq history (cons newelt history)) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1290 (when (integerp maxelt) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1291 (if (= 0 maxelt) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1292 (setq history nil) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1293 (setq tail (nthcdr (1- maxelt) history)) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1294 (when (consp tail) |
a561e5346aa8
(add-to-history): Add KEEP-ALL arg and align functionality
Kim F. Storm <storm@cua.dk>
parents:
70552
diff
changeset
|
1295 (setcdr tail nil))))) |
70415
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1296 (set history-var history))) |
72f273a616c1
(add-to-history): New function.
Kim F. Storm <storm@cua.dk>
parents:
70267
diff
changeset
|
1297 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1298 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1299 ;;;; Mode hooks. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1300 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1301 (defvar delay-mode-hooks nil |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1302 "If non-nil, `run-mode-hooks' should delay running the hooks.") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1303 (defvar delayed-mode-hooks nil |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1304 "List of delayed mode hooks waiting to be run.") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1305 (make-variable-buffer-local 'delayed-mode-hooks) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1306 (put 'delay-mode-hooks 'permanent-local t) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1307 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1308 (defvar after-change-major-mode-hook nil |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1309 "Normal hook run at the very end of major mode functions.") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1310 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1311 (defun run-mode-hooks (&rest hooks) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1312 "Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1313 Execution is delayed if `delay-mode-hooks' is non-nil. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1314 If `delay-mode-hooks' is nil, run `after-change-major-mode-hook' |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1315 after running the mode hooks. |
81765
7effaa2c79bd
(run-mode-hooks): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81646
diff
changeset
|
1316 Major mode functions should use this instead of `run-hooks' when running their |
7effaa2c79bd
(run-mode-hooks): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81646
diff
changeset
|
1317 FOO-mode-hook." |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1318 (if delay-mode-hooks |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1319 ;; Delaying case. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1320 (dolist (hook hooks) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1321 (push hook delayed-mode-hooks)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1322 ;; Normal case, just run the hook as before plus any delayed hooks. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1323 (setq hooks (nconc (nreverse delayed-mode-hooks) hooks)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1324 (setq delayed-mode-hooks nil) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1325 (apply 'run-hooks hooks) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1326 (run-hooks 'after-change-major-mode-hook))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1327 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1328 (defmacro delay-mode-hooks (&rest body) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1329 "Execute BODY, but delay any `run-mode-hooks'. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1330 These hooks will be executed by the first following call to |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1331 `run-mode-hooks' that occurs outside any `delayed-mode-hooks' form. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1332 Only affects hooks run in the current buffer." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1333 (declare (debug t) (indent 0)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1334 `(progn |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1335 (make-local-variable 'delay-mode-hooks) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1336 (let ((delay-mode-hooks t)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1337 ,@body))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1338 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1339 ;; PUBLIC: find if the current mode derives from another. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1340 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1341 (defun derived-mode-p (&rest modes) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1342 "Non-nil if the current major mode is derived from one of MODES. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1343 Uses the `derived-mode-parent' property of the symbol to trace backwards." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1344 (let ((parent major-mode)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1345 (while (and (not (memq parent modes)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1346 (setq parent (get parent 'derived-mode-parent)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1347 parent)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1348 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1349 ;;;; Minor modes. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1350 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1351 ;; If a minor mode is not defined with define-minor-mode, |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1352 ;; add it here explicitly. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1353 ;; isearch-mode is deliberately excluded, since you should |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1354 ;; not call it yourself. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1355 (defvar minor-mode-list '(auto-save-mode auto-fill-mode abbrev-mode |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1356 overwrite-mode view-mode |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1357 hs-minor-mode) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1358 "List of all minor mode functions.") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1359 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1360 (defun add-minor-mode (toggle name &optional keymap after toggle-fun) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1361 "Register a new minor mode. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1362 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1363 This is an XEmacs-compatibility function. Use `define-minor-mode' instead. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1364 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1365 TOGGLE is a symbol which is the name of a buffer-local variable that |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1366 is toggled on or off to say whether the minor mode is active or not. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1367 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1368 NAME specifies what will appear in the mode line when the minor mode |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1369 is active. NAME should be either a string starting with a space, or a |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1370 symbol whose value is such a string. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1371 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1372 Optional KEYMAP is the keymap for the minor mode that will be added |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1373 to `minor-mode-map-alist'. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1374 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1375 Optional AFTER specifies that TOGGLE should be added after AFTER |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1376 in `minor-mode-alist'. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1377 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1378 Optional TOGGLE-FUN is an interactive function to toggle the mode. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1379 It defaults to (and should by convention be) TOGGLE. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1380 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1381 If TOGGLE has a non-nil `:included' property, an entry for the mode is |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1382 included in the mode-line minor mode menu. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1383 If TOGGLE has a `:menu-tag', that is used for the menu item's label." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1384 (unless (memq toggle minor-mode-list) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1385 (push toggle minor-mode-list)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1386 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1387 (unless toggle-fun (setq toggle-fun toggle)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1388 (unless (eq toggle-fun toggle) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1389 (put toggle :minor-mode-function toggle-fun)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1390 ;; Add the name to the minor-mode-alist. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1391 (when name |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1392 (let ((existing (assq toggle minor-mode-alist))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1393 (if existing |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1394 (setcdr existing (list name)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1395 (let ((tail minor-mode-alist) found) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1396 (while (and tail (not found)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1397 (if (eq after (caar tail)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1398 (setq found tail) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1399 (setq tail (cdr tail)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1400 (if found |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1401 (let ((rest (cdr found))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1402 (setcdr found nil) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1403 (nconc found (list (list toggle name)) rest)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1404 (setq minor-mode-alist (cons (list toggle name) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1405 minor-mode-alist))))))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1406 ;; Add the toggle to the minor-modes menu if requested. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1407 (when (get toggle :included) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1408 (define-key mode-line-mode-menu |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1409 (vector toggle) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1410 (list 'menu-item |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1411 (concat |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1412 (or (get toggle :menu-tag) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1413 (if (stringp name) name (symbol-name toggle))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1414 (let ((mode-name (if (symbolp name) (symbol-value name)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1415 (if (and (stringp mode-name) (string-match "[^ ]+" mode-name)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1416 (concat " (" (match-string 0 mode-name) ")")))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1417 toggle-fun |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1418 :button (cons :toggle toggle)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1419 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1420 ;; Add the map to the minor-mode-map-alist. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1421 (when keymap |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1422 (let ((existing (assq toggle minor-mode-map-alist))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1423 (if existing |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1424 (setcdr existing keymap) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1425 (let ((tail minor-mode-map-alist) found) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1426 (while (and tail (not found)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1427 (if (eq after (caar tail)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1428 (setq found tail) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1429 (setq tail (cdr tail)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1430 (if found |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1431 (let ((rest (cdr found))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1432 (setcdr found nil) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1433 (nconc found (list (cons toggle keymap)) rest)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1434 (setq minor-mode-map-alist (cons (cons toggle keymap) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1435 minor-mode-map-alist)))))))) |
39725
c64d3e3adf5d
(symbol-file-load-history-loaded)
Miles Bader <miles@gnu.org>
parents:
39598
diff
changeset
|
1436 |
c64d3e3adf5d
(symbol-file-load-history-loaded)
Miles Bader <miles@gnu.org>
parents:
39598
diff
changeset
|
1437 ;;; Load history |
c64d3e3adf5d
(symbol-file-load-history-loaded)
Miles Bader <miles@gnu.org>
parents:
39598
diff
changeset
|
1438 |
70267
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1439 ;; (defvar symbol-file-load-history-loaded nil |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1440 ;; "Non-nil means we have loaded the file `fns-VERSION.el' in `exec-directory'. |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1441 ;; That file records the part of `load-history' for preloaded files, |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1442 ;; which is cleared out before dumping to make Emacs smaller.") |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1443 |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1444 ;; (defun load-symbol-file-load-history () |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1445 ;; "Load the file `fns-VERSION.el' in `exec-directory' if not already done. |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1446 ;; That file records the part of `load-history' for preloaded files, |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1447 ;; which is cleared out before dumping to make Emacs smaller." |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1448 ;; (unless symbol-file-load-history-loaded |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1449 ;; (load (expand-file-name |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1450 ;; ;; fns-XX.YY.ZZ.el does not work on DOS filesystem. |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1451 ;; (if (eq system-type 'ms-dos) |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1452 ;; "fns.el" |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1453 ;; (format "fns-%s.el" emacs-version)) |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1454 ;; exec-directory) |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1455 ;; ;; The file name fns-%s.el already has a .el extension. |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1456 ;; nil nil t) |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
1457 ;; (setq symbol-file-load-history-loaded t))) |
39725
c64d3e3adf5d
(symbol-file-load-history-loaded)
Miles Bader <miles@gnu.org>
parents:
39598
diff
changeset
|
1458 |
59124
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1459 (defun symbol-file (symbol &optional type) |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1460 "Return the input source in which SYMBOL was defined. |
66286
366f80f966cb
(symbol-file): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
65668
diff
changeset
|
1461 The value is an absolute file name. |
59124
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1462 It can also be nil, if the definition is not associated with any file. |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1463 |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1464 If TYPE is nil, then any kind of definition is acceptable. |
59161
0d5e992b6c18
Fix doc in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
59124
diff
changeset
|
1465 If TYPE is `defun' or `defvar', that specifies function |
62326
fd364cee20ef
(symbol-file): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
62015
diff
changeset
|
1466 definition only or variable definition only. |
fd364cee20ef
(symbol-file): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
62015
diff
changeset
|
1467 `defface' specifies a face definition only." |
59124
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1468 (if (and (or (null type) (eq type 'defun)) |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1469 (symbolp symbol) (fboundp symbol) |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1470 (eq 'autoload (car-safe (symbol-function symbol)))) |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1471 (nth 1 (symbol-function symbol)) |
47355
9e3ee43b5262
(symbol-file): Also work for autoloaded funcs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47305
diff
changeset
|
1472 (let ((files load-history) |
48474
33dafec6a9de
(symbol-file): Remove unused variable `functions'.
John Paul Wallington <jpw@pobox.com>
parents:
48077
diff
changeset
|
1473 file) |
47355
9e3ee43b5262
(symbol-file): Also work for autoloaded funcs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47305
diff
changeset
|
1474 (while files |
59124
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1475 (if (if type |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1476 (if (eq type 'defvar) |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1477 ;; Variables are present just as their names. |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1478 (member symbol (cdr (car files))) |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1479 ;; Other types are represented as (TYPE . NAME). |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1480 (member (cons type symbol) (cdr (car files)))) |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1481 ;; We accept all types, so look for variable def |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1482 ;; and then for any other kind. |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1483 (or (member symbol (cdr (car files))) |
f38536b30f3a
(messages-buffer-max-lines): Alias for message-log-max.
Richard M. Stallman <rms@gnu.org>
parents:
58934
diff
changeset
|
1484 (rassq symbol (cdr (car files))))) |
47355
9e3ee43b5262
(symbol-file): Also work for autoloaded funcs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47305
diff
changeset
|
1485 (setq file (car (car files)) files nil)) |
9e3ee43b5262
(symbol-file): Also work for autoloaded funcs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47305
diff
changeset
|
1486 (setq files (cdr files))) |
9e3ee43b5262
(symbol-file): Also work for autoloaded funcs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47305
diff
changeset
|
1487 file))) |
39725
c64d3e3adf5d
(symbol-file-load-history-loaded)
Miles Bader <miles@gnu.org>
parents:
39598
diff
changeset
|
1488 |
66508
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1489 (defun locate-library (library &optional nosuffix path interactive-call) |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1490 "Show the precise file name of Emacs library LIBRARY. |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1491 This command searches the directories in `load-path' like `\\[load-library]' |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1492 to find the file that `\\[load-library] RET LIBRARY RET' would load. |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1493 Optional second arg NOSUFFIX non-nil means don't add suffixes `load-suffixes' |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1494 to the specified name LIBRARY. |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1495 |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1496 If the optional third arg PATH is specified, that list of directories |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1497 is used instead of `load-path'. |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1498 |
95757 | 1499 When called from a program, the file name is normally returned as a |
66508
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1500 string. When run interactively, the argument INTERACTIVE-CALL is t, |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1501 and the file name is displayed in the echo area." |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1502 (interactive (list (completing-read "Locate library: " |
94183
bade431b9780
* finder.el (finder-commentary):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
1503 (apply-partially |
bade431b9780
* finder.el (finder-commentary):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
1504 'locate-file-completion-table |
bade431b9780
* finder.el (finder-commentary):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
1505 load-path (get-load-suffixes))) |
66508
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1506 nil nil |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1507 t)) |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1508 (let ((file (locate-file library |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1509 (or path load-path) |
69168
6e701396a0ec
(locate-library): Use `get-load-suffixes' instead of `load-suffixes'
Luc Teirlinck <teirllm@auburn.edu>
parents:
68848
diff
changeset
|
1510 (append (unless nosuffix (get-load-suffixes)) |
6e701396a0ec
(locate-library): Use `get-load-suffixes' instead of `load-suffixes'
Luc Teirlinck <teirllm@auburn.edu>
parents:
68848
diff
changeset
|
1511 load-file-rep-suffixes)))) |
66508
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1512 (if interactive-call |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1513 (if file |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1514 (message "Library is file %s" (abbreviate-file-name file)) |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1515 (message "No library %s in search path" library))) |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1516 file)) |
ecdadc99bf8c
* subr.el (locate-library): Move from help-fns.el.
Romain Francoise <romain@orebokech.com>
parents:
66315
diff
changeset
|
1517 |
114 | 1518 |
66306
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1519 ;;;; Specifying things to do later. |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1520 |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1521 (defmacro eval-at-startup (&rest body) |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1522 "Make arrangements to evaluate BODY when Emacs starts up. |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1523 If this is run after Emacs startup, evaluate BODY immediately. |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1524 Always returns nil. |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1525 |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1526 This works by adding a function to `before-init-hook'. |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1527 That function's doc string says which file created it." |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1528 `(progn |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1529 (if command-line-processed |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1530 (progn . ,body) |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1531 (add-hook 'before-init-hook |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1532 '(lambda () ,(concat "From " (or load-file-name "no file")) |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1533 . ,body) |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1534 t)) |
138f9b1d6682
(eval-at-startup): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
66304
diff
changeset
|
1535 nil)) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1536 |
70879
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1537 (defun load-history-regexp (file) |
71037
a0da1a83020d
(load-history-regexp): If FILE is relative, insist
Richard M. Stallman <rms@gnu.org>
parents:
70903
diff
changeset
|
1538 "Form a regexp to find FILE in `load-history'. |
a0da1a83020d
(load-history-regexp): If FILE is relative, insist
Richard M. Stallman <rms@gnu.org>
parents:
70903
diff
changeset
|
1539 FILE, a string, is described in the function `eval-after-load'." |
70879
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1540 (if (file-name-absolute-p file) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1541 (setq file (file-truename file))) |
71037
a0da1a83020d
(load-history-regexp): If FILE is relative, insist
Richard M. Stallman <rms@gnu.org>
parents:
70903
diff
changeset
|
1542 (concat (if (file-name-absolute-p file) "\\`" "\\(\\`\\|/\\)") |
70879
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1543 (regexp-quote file) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1544 (if (file-name-extension file) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1545 "" |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1546 ;; Note: regexp-opt can't be used here, since we need to call |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1547 ;; this before Emacs has been fully started. 2006-05-21 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1548 (concat "\\(" (mapconcat 'regexp-quote load-suffixes "\\|") "\\)?")) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1549 "\\(" (mapconcat 'regexp-quote jka-compr-load-suffixes "\\|") |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1550 "\\)?\\'")) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1551 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1552 (defun load-history-filename-element (file-regexp) |
71037
a0da1a83020d
(load-history-regexp): If FILE is relative, insist
Richard M. Stallman <rms@gnu.org>
parents:
70903
diff
changeset
|
1553 "Get the first elt of `load-history' whose car matches FILE-REGEXP. |
70879
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1554 Return nil if there isn't one." |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1555 (let* ((loads load-history) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1556 (load-elt (and loads (car loads)))) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1557 (save-match-data |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1558 (while (and loads |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1559 (or (null (car load-elt)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1560 (not (string-match file-regexp (car load-elt))))) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1561 (setq loads (cdr loads) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1562 load-elt (and loads (car loads))))) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1563 load-elt)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1564 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1565 (defun eval-after-load (file form) |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1566 "Arrange that, if FILE is ever loaded, FORM will be run at that time. |
10794
4443f78a2117
(eval-after-load): Run FORM now if FILE's already loaded.
Richard M. Stallman <rms@gnu.org>
parents:
10693
diff
changeset
|
1567 If FILE is already loaded, evaluate FORM right now. |
70879
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1568 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1569 If a matching file is loaded again, FORM will be evaluated again. |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1570 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1571 If FILE is a string, it may be either an absolute or a relative file |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1572 name, and may have an extension \(e.g. \".el\") or may lack one, and |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1573 additionally may or may not have an extension denoting a compressed |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1574 format \(e.g. \".gz\"). |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1575 |
71037
a0da1a83020d
(load-history-regexp): If FILE is relative, insist
Richard M. Stallman <rms@gnu.org>
parents:
70903
diff
changeset
|
1576 When FILE is absolute, this first converts it to a true name by chasing |
a0da1a83020d
(load-history-regexp): If FILE is relative, insist
Richard M. Stallman <rms@gnu.org>
parents:
70903
diff
changeset
|
1577 symbolic links. Only a file of this name \(see next paragraph regarding |
70879
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1578 extensions) will trigger the evaluation of FORM. When FILE is relative, |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1579 a file whose absolute true name ends in FILE will trigger evaluation. |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1580 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1581 When FILE lacks an extension, a file name with any extension will trigger |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1582 evaluation. Otherwise, its extension must match FILE's. A further |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1583 extension for a compressed format \(e.g. \".gz\") on FILE will not affect |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1584 this name matching. |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1585 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1586 Alternatively, FILE can be a feature (i.e. a symbol), in which case FORM |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1587 is evaluated whenever that feature is `provide'd. |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1588 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1589 Usually FILE is just a library name like \"font-lock\" or a feature name |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1590 like 'font-lock. |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1591 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1592 This function makes or adds to an entry on `after-load-alist'." |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1593 ;; Add this FORM into after-load-alist (regardless of whether we'll be |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1594 ;; evaluating it now). |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1595 (let* ((regexp-or-feature |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1596 (if (stringp file) (load-history-regexp file) file)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1597 (elt (assoc regexp-or-feature after-load-alist))) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1598 (unless elt |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1599 (setq elt (list regexp-or-feature)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1600 (push elt after-load-alist)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1601 ;; Add FORM to the element unless it's already there. |
41140
dc77550aede3
(eval-after-load): Make it work with features as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40832
diff
changeset
|
1602 (unless (member form (cdr elt)) |
70879
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1603 (nconc elt (list form))) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1604 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1605 ;; Is there an already loaded file whose name (or `provide' name) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1606 ;; matches FILE? |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1607 (if (if (stringp file) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1608 (load-history-filename-element regexp-or-feature) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1609 (featurep file)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1610 (eval form)))) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1611 |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1612 (defun do-after-load-evaluation (abs-file) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1613 "Evaluate all `eval-after-load' forms, if any, for ABS-FILE. |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1614 ABS-FILE, a string, should be the absolute true name of a file just loaded." |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1615 (let ((after-load-elts after-load-alist) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1616 a-l-element file-elements file-element form) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1617 (while after-load-elts |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1618 (setq a-l-element (car after-load-elts) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1619 after-load-elts (cdr after-load-elts)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1620 (when (and (stringp (car a-l-element)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1621 (string-match (car a-l-element) abs-file)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1622 (while (setq a-l-element (cdr a-l-element)) ; discard the file name |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1623 (setq form (car a-l-element)) |
238e43ed886e
startup.el (command-line): For names of preloaded files, don't append
Alan Mackenzie <acm@muc.de>
parents:
70678
diff
changeset
|
1624 (eval form)))))) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1625 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1626 (defun eval-next-after-load (file) |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1627 "Read the following input sexp, and run it whenever FILE is loaded. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1628 This makes or adds to an entry on `after-load-alist'. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1629 FILE should be the name of a library, with no directory name." |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1630 (eval-after-load file (read))) |
45587
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1631 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1632 ;;;; Process stuff. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1633 |
86172
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1634 (defun process-lines (program &rest args) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1635 "Execute PROGRAM with ARGS, returning its output as a list of lines. |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1636 Signal an error if the program returns with a non-zero exit status." |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1637 (with-temp-buffer |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1638 (let ((status (apply 'call-process program nil (current-buffer) nil args))) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1639 (unless (eq status 0) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1640 (error "%s exited with status %s" program status)) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1641 (goto-char (point-min)) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1642 (let (lines) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1643 (while (not (eobp)) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1644 (setq lines (cons (buffer-substring-no-properties |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1645 (line-beginning-position) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1646 (line-end-position)) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1647 lines)) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1648 (forward-line 1)) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1649 (nreverse lines))))) |
e8cb5c919219
(process-lines): Move here from ../admin/admin.el.
Glenn Morris <rgm@gnu.org>
parents:
86152
diff
changeset
|
1650 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
1651 ;; open-network-stream is a wrapper around make-network-process. |
45587
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1652 |
62372
4560134d21fa
(open-network-stream-nowait): Remove.
Kim F. Storm <storm@cua.dk>
parents:
62326
diff
changeset
|
1653 (when (featurep 'make-network-process) |
4560134d21fa
(open-network-stream-nowait): Remove.
Kim F. Storm <storm@cua.dk>
parents:
62326
diff
changeset
|
1654 (defun open-network-stream (name buffer host service) |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1655 "Open a TCP connection for a service to a host. |
45587
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1656 Returns a subprocess-object to represent the connection. |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1657 Input and output work as for subprocesses; `delete-process' closes it. |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
1658 |
45587
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1659 Args are NAME BUFFER HOST SERVICE. |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1660 NAME is name for process. It is modified if necessary to make it unique. |
55502
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
1661 BUFFER is the buffer (or buffer name) to associate with the process. |
45587
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1662 Process output goes at end of that buffer, unless you specify |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1663 an output stream or filter function to handle the output. |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1664 BUFFER may be also nil, meaning that this process is not associated |
55502
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
1665 with any buffer. |
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
1666 HOST is name of the host to connect to, or its IP address. |
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
1667 SERVICE is name of the service desired, or an integer specifying |
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
1668 a port number to connect to." |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1669 (make-network-process :name name :buffer buffer |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1670 :host host :service service))) |
45587
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1671 |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1672 ;; compatibility |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1673 |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1674 (make-obsolete |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1675 'process-kill-without-query |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1676 "use `process-query-on-exit-flag' or `set-process-query-on-exit-flag'." |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1677 "22.1") |
45587
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1678 (defun process-kill-without-query (process &optional flag) |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1679 "Say no query needed if PROCESS is running when Emacs is exited. |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1680 Optional second argument if non-nil says to require a query. |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
1681 Value is t if a query was formerly required." |
45587
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1682 (let ((old (process-query-on-exit-flag process))) |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1683 (set-process-query-on-exit-flag process nil) |
02df8e2ff88b
(open-network-stream, open-network-stream-nowait)
Richard M. Stallman <rms@gnu.org>
parents:
45246
diff
changeset
|
1684 old)) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1685 |
49225
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1686 ;; process plist management |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1687 |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1688 (defun process-get (process propname) |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1689 "Return the value of PROCESS' PROPNAME property. |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1690 This is the last value stored with `(process-put PROCESS PROPNAME VALUE)'." |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1691 (plist-get (process-plist process) propname)) |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1692 |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1693 (defun process-put (process propname value) |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1694 "Change PROCESS' PROPNAME property to VALUE. |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1695 It can be retrieved with `(process-get PROCESS PROPNAME)'." |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49492
diff
changeset
|
1696 (set-process-plist process |
49225
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1697 (plist-put (process-plist process) propname value))) |
50cb245b2072
(process-put, process-get): New functions.
Kim F. Storm <storm@cua.dk>
parents:
48935
diff
changeset
|
1698 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1699 |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1700 ;;;; Input and display facilities. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1701 |
18880
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
1702 (defvar read-quoted-char-radix 8 |
18828
4837387f683c
(read-quoted-char): Handle non-character events.
Richard M. Stallman <rms@gnu.org>
parents:
18821
diff
changeset
|
1703 "*Radix for \\[quoted-insert] and other uses of `read-quoted-char'. |
18880
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
1704 Legitimate radix values are 8, 10 and 16.") |
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
1705 |
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
1706 (custom-declare-variable-early |
47916 | 1707 'read-quoted-char-radix 8 |
18880
1ed40ed8e0c1
(custom-declare-variable-early): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18828
diff
changeset
|
1708 "*Radix for \\[quoted-insert] and other uses of `read-quoted-char'. |
18828
4837387f683c
(read-quoted-char): Handle non-character events.
Richard M. Stallman <rms@gnu.org>
parents:
18821
diff
changeset
|
1709 Legitimate radix values are 8, 10 and 16." |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1710 :type '(choice (const 8) (const 10) (const 16)) |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
1711 :group 'editing-basics) |
18828
4837387f683c
(read-quoted-char): Handle non-character events.
Richard M. Stallman <rms@gnu.org>
parents:
18821
diff
changeset
|
1712 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1713 (defun read-quoted-char (&optional prompt) |
18821
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1714 "Like `read-char', but do not allow quitting. |
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1715 Also, if the first character read is an octal digit, |
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1716 we read any number of octal digits and return the |
21008
7111f9cf9392
(read-quoted-char): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20939
diff
changeset
|
1717 specified character code. Any nondigit terminates the sequence. |
18828
4837387f683c
(read-quoted-char): Handle non-character events.
Richard M. Stallman <rms@gnu.org>
parents:
18821
diff
changeset
|
1718 If the terminator is RET, it is discarded; |
18821
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1719 any other terminator is used itself as input. |
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1720 |
21008
7111f9cf9392
(read-quoted-char): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20939
diff
changeset
|
1721 The optional argument PROMPT specifies a string to use to prompt the user. |
7111f9cf9392
(read-quoted-char): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20939
diff
changeset
|
1722 The variable `read-quoted-char-radix' controls which radix to use |
7111f9cf9392
(read-quoted-char): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20939
diff
changeset
|
1723 for numeric input." |
50427
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1724 (let ((message-log-max nil) done (first t) (code 0) char translated) |
18821
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1725 (while (not done) |
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1726 (let ((inhibit-quit first) |
12108
f75e47f673f4
(read-quoted-char): Turn on help-form and turn off help-char.
Karl Heuer <kwzh@gnu.org>
parents:
12016
diff
changeset
|
1727 ;; Don't let C-h get the help message--only help function keys. |
f75e47f673f4
(read-quoted-char): Turn on help-form and turn off help-char.
Karl Heuer <kwzh@gnu.org>
parents:
12016
diff
changeset
|
1728 (help-char nil) |
f75e47f673f4
(read-quoted-char): Turn on help-form and turn off help-char.
Karl Heuer <kwzh@gnu.org>
parents:
12016
diff
changeset
|
1729 (help-form |
f75e47f673f4
(read-quoted-char): Turn on help-form and turn off help-char.
Karl Heuer <kwzh@gnu.org>
parents:
12016
diff
changeset
|
1730 "Type the special character you want to use, |
18821
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1731 or the octal character code. |
18828
4837387f683c
(read-quoted-char): Handle non-character events.
Richard M. Stallman <rms@gnu.org>
parents:
18821
diff
changeset
|
1732 RET terminates the character code and is discarded; |
18821
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1733 any other non-digit terminates the character code and is then used as input.")) |
47747
399628a16c0a
(read-key-auxiliary-map, read-key): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47690
diff
changeset
|
1734 (setq char (read-event (and prompt (format "%s-" prompt)) t)) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1735 (if inhibit-quit (setq quit-flag nil))) |
47747
399628a16c0a
(read-key-auxiliary-map, read-key): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47690
diff
changeset
|
1736 ;; Translate TAB key into control-I ASCII character, and so on. |
399628a16c0a
(read-key-auxiliary-map, read-key): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47690
diff
changeset
|
1737 ;; Note: `read-char' does it using the `ascii-character' property. |
399628a16c0a
(read-key-auxiliary-map, read-key): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47690
diff
changeset
|
1738 ;; We could try and use read-key-sequence instead, but then C-q ESC |
399628a16c0a
(read-key-auxiliary-map, read-key): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47690
diff
changeset
|
1739 ;; or C-q C-x might not return immediately since ESC or C-x might be |
399628a16c0a
(read-key-auxiliary-map, read-key): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47690
diff
changeset
|
1740 ;; bound to some prefix in function-key-map or key-translation-map. |
92498
eb2dddded6bc
(read-quoted-char): Resolve modifers of the character event.
Kenichi Handa <handa@m17n.org>
parents:
92148
diff
changeset
|
1741 (setq translated |
eb2dddded6bc
(read-quoted-char): Resolve modifers of the character event.
Kenichi Handa <handa@m17n.org>
parents:
92148
diff
changeset
|
1742 (if (integerp char) |
eb2dddded6bc
(read-quoted-char): Resolve modifers of the character event.
Kenichi Handa <handa@m17n.org>
parents:
92148
diff
changeset
|
1743 (char-resolve-modifers char) |
eb2dddded6bc
(read-quoted-char): Resolve modifers of the character event.
Kenichi Handa <handa@m17n.org>
parents:
92148
diff
changeset
|
1744 char)) |
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83392
diff
changeset
|
1745 (let ((translation (lookup-key local-function-key-map (vector char)))) |
50427
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1746 (if (arrayp translation) |
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1747 (setq translated (aref translation 0)))) |
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1748 (cond ((null translated)) |
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1749 ((not (integerp translated)) |
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1750 (setq unread-command-events (list char) |
18828
4837387f683c
(read-quoted-char): Handle non-character events.
Richard M. Stallman <rms@gnu.org>
parents:
18821
diff
changeset
|
1751 done t)) |
50427
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1752 ((/= (logand translated ?\M-\^@) 0) |
19175
3d80c899a15d
(read-quoted-char): Fix handling of meta-chars.
Richard M. Stallman <rms@gnu.org>
parents:
19002
diff
changeset
|
1753 ;; Turn a meta-character into a character with the 0200 bit set. |
50427
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1754 (setq code (logior (logand translated (lognot ?\M-\^@)) 128) |
19175
3d80c899a15d
(read-quoted-char): Fix handling of meta-chars.
Richard M. Stallman <rms@gnu.org>
parents:
19002
diff
changeset
|
1755 done t)) |
50427
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1756 ((and (<= ?0 translated) (< translated (+ ?0 (min 10 read-quoted-char-radix)))) |
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1757 (setq code (+ (* code read-quoted-char-radix) (- translated ?0))) |
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1758 (and prompt (setq prompt (message "%s %c" prompt translated)))) |
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1759 ((and (<= ?a (downcase translated)) |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
1760 (< (downcase translated) (+ ?a -10 (min 36 read-quoted-char-radix)))) |
19002
f21881dcd27b
(read-quoted-char): Consistently downcase letter "digits".
Richard M. Stallman <rms@gnu.org>
parents:
18948
diff
changeset
|
1761 (setq code (+ (* code read-quoted-char-radix) |
50427
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1762 (+ 10 (- (downcase translated) ?a)))) |
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1763 (and prompt (setq prompt (message "%s %c" prompt translated)))) |
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1764 ((and (not first) (eq translated ?\C-m)) |
18821
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1765 (setq done t)) |
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1766 ((not first) |
50427
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1767 (setq unread-command-events (list char) |
18821
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1768 done t)) |
50427
6ce9db7934cb
(read-quoted-char): Remember the input char
Richard M. Stallman <rms@gnu.org>
parents:
50417
diff
changeset
|
1769 (t (setq code translated |
18821
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1770 done t))) |
83425393d550
(read-quoted-char): Read any number of octal digits,
Richard M. Stallman <rms@gnu.org>
parents:
18044
diff
changeset
|
1771 (setq first nil)) |
19175
3d80c899a15d
(read-quoted-char): Fix handling of meta-chars.
Richard M. Stallman <rms@gnu.org>
parents:
19002
diff
changeset
|
1772 code)) |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
1773 |
57789
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1774 (defun read-passwd (prompt &optional confirm default) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1775 "Read a password, prompting with PROMPT, and return it. |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1776 If optional CONFIRM is non-nil, read the password twice to make sure. |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1777 Optional DEFAULT is a default password to use instead of empty input. |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1778 |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1779 This function echoes `.' for each character that the user types. |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1780 The user ends with RET, LFD, or ESC. DEL or C-h rubs out. C-u kills line. |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1781 C-g quits; if `inhibit-quit' was non-nil around this function, |
70901
cc60343f8fd6
(with-local-quit): When handling `quit' signal,
Richard M. Stallman <rms@gnu.org>
parents:
70897
diff
changeset
|
1782 then it returns nil if the user types C-g, but quit-flag remains set. |
57789
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1783 |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1784 Once the caller uses the password, it can erase the password |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1785 by doing (clear-string STRING)." |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1786 (with-local-quit |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1787 (if confirm |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1788 (let (success) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1789 (while (not success) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1790 (let ((first (read-passwd prompt nil default)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1791 (second (read-passwd "Confirm password: " nil default))) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1792 (if (equal first second) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1793 (progn |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1794 (and (arrayp second) (clear-string second)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1795 (setq success first)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1796 (and (arrayp first) (clear-string first)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1797 (and (arrayp second) (clear-string second)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1798 (message "Password not repeated accurately; please start over") |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1799 (sit-for 1)))) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1800 success) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1801 (let ((pass nil) |
70897
b08d75867f7f
(read-passwd): Copy PROMPT before changing its properties.
Richard M. Stallman <rms@gnu.org>
parents:
70879
diff
changeset
|
1802 ;; Copy it so that add-text-properties won't modify |
b08d75867f7f
(read-passwd): Copy PROMPT before changing its properties.
Richard M. Stallman <rms@gnu.org>
parents:
70879
diff
changeset
|
1803 ;; the object that was passed in by the caller. |
b08d75867f7f
(read-passwd): Copy PROMPT before changing its properties.
Richard M. Stallman <rms@gnu.org>
parents:
70879
diff
changeset
|
1804 (prompt (copy-sequence prompt)) |
57789
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1805 (c 0) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1806 (echo-keystrokes 0) |
69978
cb54ae454387
(read-passwd): Bind `message-log-max' to nil.
Romain Francoise <romain@orebokech.com>
parents:
69830
diff
changeset
|
1807 (cursor-in-echo-area t) |
cb54ae454387
(read-passwd): Bind `message-log-max' to nil.
Romain Francoise <romain@orebokech.com>
parents:
69830
diff
changeset
|
1808 (message-log-max nil)) |
67012
6b634736fd83
(read-passwd): Fontify the prompt as we do with other prompts.
Eli Zaretskii <eliz@gnu.org>
parents:
66508
diff
changeset
|
1809 (add-text-properties 0 (length prompt) |
6b634736fd83
(read-passwd): Fontify the prompt as we do with other prompts.
Eli Zaretskii <eliz@gnu.org>
parents:
66508
diff
changeset
|
1810 minibuffer-prompt-properties prompt) |
57789
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1811 (while (progn (message "%s%s" |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1812 prompt |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1813 (make-string (length pass) ?.)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1814 (setq c (read-char-exclusive nil t)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1815 (and (/= c ?\r) (/= c ?\n) (/= c ?\e))) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1816 (clear-this-command-keys) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1817 (if (= c ?\C-u) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1818 (progn |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1819 (and (arrayp pass) (clear-string pass)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1820 (setq pass "")) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1821 (if (and (/= c ?\b) (/= c ?\177)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1822 (let* ((new-char (char-to-string c)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1823 (new-pass (concat pass new-char))) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1824 (and (arrayp pass) (clear-string pass)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1825 (clear-string new-char) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1826 (setq c ?\0) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1827 (setq pass new-pass)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1828 (if (> (length pass) 0) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1829 (let ((new-pass (substring pass 0 -1))) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1830 (and (arrayp pass) (clear-string pass)) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1831 (setq pass new-pass)))))) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1832 (message nil) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1833 (or pass default ""))))) |
6a6fe71c779d
subr.el (read-passwd): Move back from password.el.
Simon Josefsson <jas@extundo.com>
parents:
57778
diff
changeset
|
1834 |
54570
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1835 ;; This should be used by `call-interactively' for `n' specs. |
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1836 (defun read-number (prompt &optional default) |
77359
d57bf0ca865e
(read-number): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77092
diff
changeset
|
1837 "Read a numeric value in the minibuffer, prompting with PROMPT. |
d57bf0ca865e
(read-number): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77092
diff
changeset
|
1838 DEFAULT specifies a default value to return if the user just types RET. |
d57bf0ca865e
(read-number): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77092
diff
changeset
|
1839 The value of DEFAULT is inserted into PROMPT." |
54570
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1840 (let ((n nil)) |
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1841 (when default |
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1842 (setq prompt |
55891
3c32f5d8430f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
Miles Bader <miles@gnu.org>
parents:
55884
diff
changeset
|
1843 (if (string-match "\\(\\):[ \t]*\\'" prompt) |
3c32f5d8430f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
Miles Bader <miles@gnu.org>
parents:
55884
diff
changeset
|
1844 (replace-match (format " (default %s)" default) t t prompt 1) |
3c32f5d8430f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
Miles Bader <miles@gnu.org>
parents:
55884
diff
changeset
|
1845 (replace-regexp-in-string "[ \t]*\\'" |
3c32f5d8430f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
Miles Bader <miles@gnu.org>
parents:
55884
diff
changeset
|
1846 (format " (default %s) " default) |
55976
bb7bcfc53d76
(insert-buffer-substring-no-properties, insert-buffer-substring-as-yank):
Juanma Barranquero <lekktu@gmail.com>
parents:
55891
diff
changeset
|
1847 prompt t t)))) |
54570
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1848 (while |
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1849 (progn |
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1850 (let ((str (read-from-minibuffer prompt nil nil nil nil |
55008
f5cafaedbab0
(read-number): Check whether `default' is nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54887
diff
changeset
|
1851 (and default |
f5cafaedbab0
(read-number): Check whether `default' is nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54887
diff
changeset
|
1852 (number-to-string default))))) |
77423
954d7a5a16f6
(read-number): Catch errors.
Richard M. Stallman <rms@gnu.org>
parents:
77359
diff
changeset
|
1853 (condition-case nil |
954d7a5a16f6
(read-number): Catch errors.
Richard M. Stallman <rms@gnu.org>
parents:
77359
diff
changeset
|
1854 (setq n (cond |
954d7a5a16f6
(read-number): Catch errors.
Richard M. Stallman <rms@gnu.org>
parents:
77359
diff
changeset
|
1855 ((zerop (length str)) default) |
954d7a5a16f6
(read-number): Catch errors.
Richard M. Stallman <rms@gnu.org>
parents:
77359
diff
changeset
|
1856 ((stringp str) (read str)))) |
954d7a5a16f6
(read-number): Catch errors.
Richard M. Stallman <rms@gnu.org>
parents:
77359
diff
changeset
|
1857 (error nil))) |
54570
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1858 (unless (numberp n) |
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1859 (message "Please enter a number.") |
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1860 (sit-for 1) |
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1861 t))) |
cf58c77ee000
(read-number): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54016
diff
changeset
|
1862 n)) |
71763
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1863 |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1864 (defun sit-for (seconds &optional nodisp obsolete) |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1865 "Perform redisplay, then wait for SECONDS seconds or until input is available. |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1866 SECONDS may be a floating-point value. |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1867 \(On operating systems that do not support waiting for fractions of a |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1868 second, floating-point values are rounded down to the nearest integer.) |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1869 |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1870 If optional arg NODISP is t, don't redisplay, just wait for input. |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1871 Redisplay does not happen if input is available before it starts. |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1872 |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1873 Value is t if waited the full time with no input arriving, and nil otherwise. |
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1874 |
71775
dbb73e0b716b
(sit-for): Doc fix. Specify normal arg list using fn-form.
Kim F. Storm <storm@cua.dk>
parents:
71763
diff
changeset
|
1875 An obsolete, but still supported form is |
71763
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1876 \(sit-for SECONDS &optional MILLISECONDS NODISP) |
71775
dbb73e0b716b
(sit-for): Doc fix. Specify normal arg list using fn-form.
Kim F. Storm <storm@cua.dk>
parents:
71763
diff
changeset
|
1877 where the optional arg MILLISECONDS specifies an additional wait period, |
71763
bedc73f663be
* subr.el (sit-for): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71726
diff
changeset
|
1878 in milliseconds; this was useful when Emacs was built without |
71775
dbb73e0b716b
(sit-for): Doc fix. Specify normal arg list using fn-form.
Kim F. Storm <storm@cua.dk>
parents:
71763
diff
changeset
|
1879 floating point support. |
dbb73e0b716b
(sit-for): Doc fix. Specify normal arg list using fn-form.
Kim F. Storm <storm@cua.dk>
parents:
71763
diff
changeset
|
1880 |
dbb73e0b716b
(sit-for): Doc fix. Specify normal arg list using fn-form.
Kim F. Storm <storm@cua.dk>
parents:
71763
diff
changeset
|
1881 \(fn SECONDS &optional NODISP)" |
80173
0fade0cf2913
(sit-for): Fix obsolete form for nil second argument.
Glenn Morris <rgm@gnu.org>
parents:
80023
diff
changeset
|
1882 (if (numberp nodisp) |
0fade0cf2913
(sit-for): Fix obsolete form for nil second argument.
Glenn Morris <rgm@gnu.org>
parents:
80023
diff
changeset
|
1883 (setq seconds (+ seconds (* 1e-3 nodisp)) |
0fade0cf2913
(sit-for): Fix obsolete form for nil second argument.
Glenn Morris <rgm@gnu.org>
parents:
80023
diff
changeset
|
1884 nodisp obsolete) |
0fade0cf2913
(sit-for): Fix obsolete form for nil second argument.
Glenn Morris <rgm@gnu.org>
parents:
80023
diff
changeset
|
1885 (if obsolete (setq nodisp obsolete))) |
72817
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1886 (cond |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1887 (noninteractive |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1888 (sleep-for seconds) |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1889 t) |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1890 ((input-pending-p) |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1891 nil) |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1892 ((<= seconds 0) |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1893 (or nodisp (redisplay))) |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1894 (t |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1895 (or nodisp (redisplay)) |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1896 (let ((read (read-event nil nil seconds))) |
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
1897 (or (null read) |
73465
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1898 (progn |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1899 ;; If last command was a prefix arg, e.g. C-u, push this event onto |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1900 ;; unread-command-events as (t . EVENT) so it will be added to |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1901 ;; this-command-keys by read-key-sequence. |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1902 (if (eq overriding-terminal-local-map universal-argument-map) |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1903 (setq read (cons t read))) |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1904 (push read unread-command-events) |
03050ee24abc
(add-to-list): Optimize if compare-fn is `eq' or `eql'.
Kim F. Storm <storm@cua.dk>
parents:
73415
diff
changeset
|
1905 nil)))))) |
20472
79ea90039b23
(read-password): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20410
diff
changeset
|
1906 |
44668
52222efc9d4d
(insert-for-yank): New function.
Richard M. Stallman <rms@gnu.org>
parents:
44473
diff
changeset
|
1907 ;;; Atomic change groups. |
52222efc9d4d
(insert-for-yank): New function.
Richard M. Stallman <rms@gnu.org>
parents:
44473
diff
changeset
|
1908 |
43126
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1909 (defmacro atomic-change-group (&rest body) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1910 "Perform BODY as an atomic change group. |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1911 This means that if BODY exits abnormally, |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1912 all of its changes to the current buffer are undone. |
46783
a4e9eb2530cb
(atomic-change-group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46537
diff
changeset
|
1913 This works regardless of whether undo is enabled in the buffer. |
43126
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1914 |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1915 This mechanism is transparent to ordinary use of undo; |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1916 if undo is enabled in the buffer and BODY succeeds, the |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1917 user can undo the change normally." |
67274
a69df0269000
(atomic-change-group): Add edebug and indentation spec.
John Paul Wallington <jpw@pobox.com>
parents:
67012
diff
changeset
|
1918 (declare (indent 0) (debug t)) |
43126
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1919 (let ((handle (make-symbol "--change-group-handle--")) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1920 (success (make-symbol "--change-group-success--"))) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1921 `(let ((,handle (prepare-change-group)) |
79824
e9adfbf7d96e
(atomic-change-group): Prevent undo list truncation.
Richard M. Stallman <rms@gnu.org>
parents:
79721
diff
changeset
|
1922 ;; Don't truncate any undo data in the middle of this. |
e9adfbf7d96e
(atomic-change-group): Prevent undo list truncation.
Richard M. Stallman <rms@gnu.org>
parents:
79721
diff
changeset
|
1923 (undo-outer-limit nil) |
e9adfbf7d96e
(atomic-change-group): Prevent undo list truncation.
Richard M. Stallman <rms@gnu.org>
parents:
79721
diff
changeset
|
1924 (undo-limit most-positive-fixnum) |
e9adfbf7d96e
(atomic-change-group): Prevent undo list truncation.
Richard M. Stallman <rms@gnu.org>
parents:
79721
diff
changeset
|
1925 (undo-strong-limit most-positive-fixnum) |
43126
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1926 (,success nil)) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1927 (unwind-protect |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1928 (progn |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1929 ;; This is inside the unwind-protect because |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1930 ;; it enables undo if that was disabled; we need |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1931 ;; to make sure that it gets disabled again. |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1932 (activate-change-group ,handle) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1933 ,@body |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1934 (setq ,success t)) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1935 ;; Either of these functions will disable undo |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1936 ;; if it was disabled before. |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1937 (if ,success |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1938 (accept-change-group ,handle) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1939 (cancel-change-group ,handle)))))) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1940 |
51068
4441e202a6f4
(prepare-change-group): Reinstate BUFFER arg; make it work.
Richard M. Stallman <rms@gnu.org>
parents:
51062
diff
changeset
|
1941 (defun prepare-change-group (&optional buffer) |
43126
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1942 "Return a handle for the current buffer's state, for a change group. |
51068
4441e202a6f4
(prepare-change-group): Reinstate BUFFER arg; make it work.
Richard M. Stallman <rms@gnu.org>
parents:
51062
diff
changeset
|
1943 If you specify BUFFER, make a handle for BUFFER's state instead. |
43126
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1944 |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1945 Pass the handle to `activate-change-group' afterward to initiate |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1946 the actual changes of the change group. |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1947 |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1948 To finish the change group, call either `accept-change-group' or |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1949 `cancel-change-group' passing the same handle as argument. Call |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1950 `accept-change-group' to accept the changes in the group as final; |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1951 call `cancel-change-group' to undo them all. You should use |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1952 `unwind-protect' to make sure the group is always finished. The call |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1953 to `activate-change-group' should be inside the `unwind-protect'. |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1954 Once you finish the group, don't use the handle again--don't try to |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1955 finish the same group twice. For a simple example of correct use, see |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1956 the source code of `atomic-change-group'. |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1957 |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1958 The handle records only the specified buffer. To make a multibuffer |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1959 change group, call this function once for each buffer you want to |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1960 cover, then use `nconc' to combine the returned values, like this: |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1961 |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1962 (nconc (prepare-change-group buffer-1) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1963 (prepare-change-group buffer-2)) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1964 |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1965 You can then activate that multibuffer change group with a single |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1966 call to `activate-change-group' and finish it with a single call |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1967 to `accept-change-group' or `cancel-change-group'." |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1968 |
51068
4441e202a6f4
(prepare-change-group): Reinstate BUFFER arg; make it work.
Richard M. Stallman <rms@gnu.org>
parents:
51062
diff
changeset
|
1969 (if buffer |
4441e202a6f4
(prepare-change-group): Reinstate BUFFER arg; make it work.
Richard M. Stallman <rms@gnu.org>
parents:
51062
diff
changeset
|
1970 (list (cons buffer (with-current-buffer buffer buffer-undo-list))) |
4441e202a6f4
(prepare-change-group): Reinstate BUFFER arg; make it work.
Richard M. Stallman <rms@gnu.org>
parents:
51062
diff
changeset
|
1971 (list (cons (current-buffer) buffer-undo-list)))) |
43126
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1972 |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1973 (defun activate-change-group (handle) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1974 "Activate a change group made with `prepare-change-group' (which see)." |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1975 (dolist (elt handle) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1976 (with-current-buffer (car elt) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1977 (if (eq buffer-undo-list t) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1978 (setq buffer-undo-list nil))))) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1979 |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1980 (defun accept-change-group (handle) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1981 "Finish a change group made with `prepare-change-group' (which see). |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1982 This finishes the change group by accepting its changes as final." |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1983 (dolist (elt handle) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1984 (with-current-buffer (car elt) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1985 (if (eq elt t) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1986 (setq buffer-undo-list t))))) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1987 |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1988 (defun cancel-change-group (handle) |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1989 "Finish a change group made with `prepare-change-group' (which see). |
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
1990 This finishes the change group by reverting all of its changes." |
80023
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
1991 (dolist (elt handle) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
1992 (with-current-buffer (car elt) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
1993 (setq elt (cdr elt)) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
1994 (let ((old-car |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
1995 (if (consp elt) (car elt))) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
1996 (old-cdr |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
1997 (if (consp elt) (cdr elt)))) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
1998 ;; Temporarily truncate the undo log at ELT. |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
1999 (when (consp elt) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2000 (setcar elt nil) (setcdr elt nil)) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2001 (unless (eq last-command 'undo) (undo-start)) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2002 ;; Make sure there's no confusion. |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2003 (when (and (consp elt) (not (eq elt (last pending-undo-list)))) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2004 (error "Undoing to some unrelated state")) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2005 ;; Undo it all. |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2006 (save-excursion |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2007 (while (listp pending-undo-list) (undo-more 1))) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2008 ;; Reset the modified cons cell ELT to its original content. |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2009 (when (consp elt) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2010 (setcar elt old-car) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2011 (setcdr elt old-cdr)) |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2012 ;; Revert the undo info to what it was when we grabbed the state. |
ac327929a12c
(cancel-change-group): Improve last fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80022
diff
changeset
|
2013 (setq buffer-undo-list elt))))) |
43126
6f39ff1c6d8f
(atomic-change-group, prepare-change-group, activate-change-group)
Richard M. Stallman <rms@gnu.org>
parents:
42941
diff
changeset
|
2014 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2015 ;;;; Display-related functions. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2016 |
44285
30505fab0350
(redraw-modeline): Define alias.
Richard M. Stallman <rms@gnu.org>
parents:
44251
diff
changeset
|
2017 ;; For compatibility. |
30505fab0350
(redraw-modeline): Define alias.
Richard M. Stallman <rms@gnu.org>
parents:
44251
diff
changeset
|
2018 (defalias 'redraw-modeline 'force-mode-line-update) |
30505fab0350
(redraw-modeline): Define alias.
Richard M. Stallman <rms@gnu.org>
parents:
44251
diff
changeset
|
2019 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
2020 (defun force-mode-line-update (&optional all) |
52858
b4112065d679
(force-mode-line-update): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
2021 "Force redisplay of the current buffer's mode line and header line. |
b4112065d679
(force-mode-line-update): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
2022 With optional non-nil ALL, force redisplay of all mode lines and |
b4112065d679
(force-mode-line-update): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
2023 header lines. This function also forces recomputation of the |
b4112065d679
(force-mode-line-update): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
2024 menu bar menus and the frame title." |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
2025 (if all (save-excursion (set-buffer (other-buffer)))) |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
2026 (set-buffer-modified-p (buffer-modified-p))) |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
2027 |
41618
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2028 (defun momentary-string-display (string pos &optional exit-char message) |
114 | 2029 "Momentarily display STRING in the buffer at POS. |
55187
1bc853c54243
(momentary-string-display): Support EXIT-CHAR that is
Eli Zaretskii <eliz@gnu.org>
parents:
55013
diff
changeset
|
2030 Display remains until next event is input. |
75063
394073868e11
(momentary-string-display): After moving point, set POS variable to it to avoid
Juanma Barranquero <lekktu@gmail.com>
parents:
74597
diff
changeset
|
2031 If POS is a marker, only its position is used; its buffer is ignored. |
55187
1bc853c54243
(momentary-string-display): Support EXIT-CHAR that is
Eli Zaretskii <eliz@gnu.org>
parents:
55013
diff
changeset
|
2032 Optional third arg EXIT-CHAR can be a character, event or event |
1bc853c54243
(momentary-string-display): Support EXIT-CHAR that is
Eli Zaretskii <eliz@gnu.org>
parents:
55013
diff
changeset
|
2033 description list. EXIT-CHAR defaults to SPC. If the input is |
1bc853c54243
(momentary-string-display): Support EXIT-CHAR that is
Eli Zaretskii <eliz@gnu.org>
parents:
55013
diff
changeset
|
2034 EXIT-CHAR it is swallowed; otherwise it is then available as |
1bc853c54243
(momentary-string-display): Support EXIT-CHAR that is
Eli Zaretskii <eliz@gnu.org>
parents:
55013
diff
changeset
|
2035 input (as a command if nothing else). |
114 | 2036 Display MESSAGE (optional fourth arg) in the echo area. |
2037 If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there." | |
74242
f4d1181a38c2
(momentary-string-display): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
74085
diff
changeset
|
2038 (or exit-char (setq exit-char ?\s)) |
95778
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2039 (let ((ol (make-overlay pos pos)) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2040 (message (copy-sequence string))) |
114 | 2041 (unwind-protect |
95778
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2042 (progn |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2043 (save-excursion |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2044 (overlay-put ol 'after-string message) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2045 (goto-char pos) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2046 ;; To avoid trouble with out-of-bounds position |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2047 (setq pos (point)) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2048 ;; If the message end is off screen, recenter now. |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2049 (if (<= (window-end nil t) pos) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2050 (recenter (/ (window-height) 2)))) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2051 (message (or message "Type %s to continue editing.") |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2052 (single-key-description exit-char)) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2053 (let (char) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2054 (if (integerp exit-char) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2055 (condition-case nil |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2056 (progn |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2057 (setq char (read-char)) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2058 (or (eq char exit-char) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2059 (setq unread-command-events (list char)))) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2060 (error |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2061 ;; `exit-char' is a character, hence it differs |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2062 ;; from char, which is an event. |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2063 (setq unread-command-events (list char)))) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2064 ;; `exit-char' can be an event, or an event description list. |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2065 (setq char (read-event)) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2066 (or (eq char exit-char) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2067 (eq char (event-convert-list exit-char)) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2068 (setq unread-command-events (list char)))))) |
c9b3cb8a81ec
(momentary-string-display): Use an overlay.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95757
diff
changeset
|
2069 (delete-overlay ol)))) |
114 | 2070 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
2071 |
41618
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2072 ;;;; Overlay operations |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2073 |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2074 (defun copy-overlay (o) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2075 "Return a copy of overlay O." |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2076 (let ((o1 (make-overlay (overlay-start o) (overlay-end o) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2077 ;; FIXME: there's no easy way to find the |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2078 ;; insertion-type of the two markers. |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2079 (overlay-buffer o))) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2080 (props (overlay-properties o))) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2081 (while props |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2082 (overlay-put o1 (pop props) (pop props))) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2083 o1)) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2084 |
55202
4c64ee838f41
* subr.el (remove-overlays): Make arguments optional.
Masatake YAMATO <jet@gyve.org>
parents:
55187
diff
changeset
|
2085 (defun remove-overlays (&optional beg end name val) |
41618
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2086 "Clear BEG and END of overlays whose property NAME has value VAL. |
55477
e191e6d1554e
(remove-overlays, read-passwd): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55406
diff
changeset
|
2087 Overlays might be moved and/or split. |
e191e6d1554e
(remove-overlays, read-passwd): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55406
diff
changeset
|
2088 BEG and END default respectively to the beginning and end of buffer." |
73829
201aa7c21cab
(remove-overlays): Call overlay-recenter.
Richard M. Stallman <rms@gnu.org>
parents:
73555
diff
changeset
|
2089 ;; This speeds up the loops over overlays. |
55202
4c64ee838f41
* subr.el (remove-overlays): Make arguments optional.
Masatake YAMATO <jet@gyve.org>
parents:
55187
diff
changeset
|
2090 (unless beg (setq beg (point-min))) |
4c64ee838f41
* subr.el (remove-overlays): Make arguments optional.
Masatake YAMATO <jet@gyve.org>
parents:
55187
diff
changeset
|
2091 (unless end (setq end (point-max))) |
73943
882d43d66c71
(remove-overlays): Fix last change.
Richard M. Stallman <rms@gnu.org>
parents:
73831
diff
changeset
|
2092 (overlay-recenter end) |
41618
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2093 (if (< end beg) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2094 (setq beg (prog1 end (setq end beg)))) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2095 (save-excursion |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2096 (dolist (o (overlays-in beg end)) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2097 (when (eq (overlay-get o name) val) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2098 ;; Either push this overlay outside beg...end |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2099 ;; or split it to exclude beg...end |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2100 ;; or delete it entirely (if it is contained in beg...end). |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2101 (if (< (overlay-start o) beg) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2102 (if (> (overlay-end o) end) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2103 (progn |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2104 (move-overlay (copy-overlay o) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2105 (overlay-start o) beg) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2106 (move-overlay o end (overlay-end o))) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2107 (move-overlay o (overlay-start o) beg)) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2108 (if (> (overlay-end o) end) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2109 (move-overlay o end (overlay-end o)) |
812e52cc5162
(copy-overlay, remove-overlays): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41187
diff
changeset
|
2110 (delete-overlay o))))))) |
42917
ec2db12c7670
(copy-without-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42266
diff
changeset
|
2111 |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
2112 ;;;; Miscellanea. |
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
2113 |
20846
985a277c9b9a
(suspend-hook, suspend-resume-hook): New defvars.
Richard M. Stallman <rms@gnu.org>
parents:
20687
diff
changeset
|
2114 (defvar suspend-hook nil |
985a277c9b9a
(suspend-hook, suspend-resume-hook): New defvars.
Richard M. Stallman <rms@gnu.org>
parents:
20687
diff
changeset
|
2115 "Normal hook run by `suspend-emacs', before suspending.") |
985a277c9b9a
(suspend-hook, suspend-resume-hook): New defvars.
Richard M. Stallman <rms@gnu.org>
parents:
20687
diff
changeset
|
2116 |
985a277c9b9a
(suspend-hook, suspend-resume-hook): New defvars.
Richard M. Stallman <rms@gnu.org>
parents:
20687
diff
changeset
|
2117 (defvar suspend-resume-hook nil |
985a277c9b9a
(suspend-hook, suspend-resume-hook): New defvars.
Richard M. Stallman <rms@gnu.org>
parents:
20687
diff
changeset
|
2118 "Normal hook run by `suspend-emacs', after Emacs is continued.") |
985a277c9b9a
(suspend-hook, suspend-resume-hook): New defvars.
Richard M. Stallman <rms@gnu.org>
parents:
20687
diff
changeset
|
2119 |
42083
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2120 (defvar temp-buffer-show-hook nil |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2121 "Normal hook run by `with-output-to-temp-buffer' after displaying the buffer. |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2122 When the hook runs, the temporary buffer is current, and the window it |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2123 was displayed in is selected. This hook is normally set up with a |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2124 function to make the buffer read only, and find function names and |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2125 variable names in it, provided the major mode is still Help mode.") |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2126 |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2127 (defvar temp-buffer-setup-hook nil |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2128 "Normal hook run by `with-output-to-temp-buffer' at the start. |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2129 When the hook runs, the temporary buffer is current. |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2130 This hook is normally set up with a function to put the buffer in Help |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2131 mode.") |
981f93cc55d1
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
42076
diff
changeset
|
2132 |
10254
1ac3c8fea14a
(font-lock-defaults): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
10178
diff
changeset
|
2133 ;; Avoid compiler warnings about this variable, |
1ac3c8fea14a
(font-lock-defaults): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
10178
diff
changeset
|
2134 ;; which has a special meaning on certain system types. |
1ac3c8fea14a
(font-lock-defaults): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
10178
diff
changeset
|
2135 (defvar buffer-file-type nil |
1ac3c8fea14a
(font-lock-defaults): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
10178
diff
changeset
|
2136 "Non-nil if the visited file is a binary file. |
1ac3c8fea14a
(font-lock-defaults): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
10178
diff
changeset
|
2137 This variable is meaningful on MS-DOG and Windows NT. |
1ac3c8fea14a
(font-lock-defaults): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
10178
diff
changeset
|
2138 On those systems, it is automatically local in every buffer. |
1ac3c8fea14a
(font-lock-defaults): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
10178
diff
changeset
|
2139 On other systems, this variable is normally always nil.") |
68492
f4d24a8eaed1
(toplevel): Define `cl-assertion-failed' condition here because the
John Paul Wallington <jpw@pobox.com>
parents:
68400
diff
changeset
|
2140 |
f4d24a8eaed1
(toplevel): Define `cl-assertion-failed' condition here because the
John Paul Wallington <jpw@pobox.com>
parents:
68400
diff
changeset
|
2141 ;; The `assert' macro from the cl package signals |
f4d24a8eaed1
(toplevel): Define `cl-assertion-failed' condition here because the
John Paul Wallington <jpw@pobox.com>
parents:
68400
diff
changeset
|
2142 ;; `cl-assertion-failed' at runtime so always define it. |
f4d24a8eaed1
(toplevel): Define `cl-assertion-failed' condition here because the
John Paul Wallington <jpw@pobox.com>
parents:
68400
diff
changeset
|
2143 (put 'cl-assertion-failed 'error-conditions '(error)) |
f4d24a8eaed1
(toplevel): Define `cl-assertion-failed' condition here because the
John Paul Wallington <jpw@pobox.com>
parents:
68400
diff
changeset
|
2144 (put 'cl-assertion-failed 'error-message "Assertion failed") |
f4d24a8eaed1
(toplevel): Define `cl-assertion-failed' condition here because the
John Paul Wallington <jpw@pobox.com>
parents:
68400
diff
changeset
|
2145 |
81338
62535fec6ee1
(user-emacs-directory): New defconst.
Chong Yidong <cyd@stupidchicken.com>
parents:
77423
diff
changeset
|
2146 (defconst user-emacs-directory |
62535fec6ee1
(user-emacs-directory): New defconst.
Chong Yidong <cyd@stupidchicken.com>
parents:
77423
diff
changeset
|
2147 (if (eq system-type 'ms-dos) |
62535fec6ee1
(user-emacs-directory): New defconst.
Chong Yidong <cyd@stupidchicken.com>
parents:
77423
diff
changeset
|
2148 ;; MS-DOS cannot have initial dot. |
62535fec6ee1
(user-emacs-directory): New defconst.
Chong Yidong <cyd@stupidchicken.com>
parents:
77423
diff
changeset
|
2149 "~/_emacs.d/" |
62535fec6ee1
(user-emacs-directory): New defconst.
Chong Yidong <cyd@stupidchicken.com>
parents:
77423
diff
changeset
|
2150 "~/.emacs.d/") |
62535fec6ee1
(user-emacs-directory): New defconst.
Chong Yidong <cyd@stupidchicken.com>
parents:
77423
diff
changeset
|
2151 "Directory beneath which additional per-user Emacs-specific files are placed. |
62535fec6ee1
(user-emacs-directory): New defconst.
Chong Yidong <cyd@stupidchicken.com>
parents:
77423
diff
changeset
|
2152 Various programs in Emacs store information in this directory. |
62535fec6ee1
(user-emacs-directory): New defconst.
Chong Yidong <cyd@stupidchicken.com>
parents:
77423
diff
changeset
|
2153 Note that this should end with a directory separator.") |
62535fec6ee1
(user-emacs-directory): New defconst.
Chong Yidong <cyd@stupidchicken.com>
parents:
77423
diff
changeset
|
2154 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2155 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2156 ;;;; Misc. useful functions. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2157 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2158 (defun find-tag-default () |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2159 "Determine default tag to search for, based on text at point. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2160 If there is no plausible default, return nil." |
88001
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2161 (let (from to bound) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2162 (when (or (progn |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2163 ;; Look at text around `point'. |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2164 (save-excursion |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2165 (skip-syntax-backward "w_") (setq from (point))) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2166 (save-excursion |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2167 (skip-syntax-forward "w_") (setq to (point))) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2168 (> to from)) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2169 ;; Look between `line-beginning-position' and `point'. |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2170 (save-excursion |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2171 (and (setq bound (line-beginning-position)) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2172 (skip-syntax-backward "^w_" bound) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2173 (> (setq to (point)) bound) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2174 (skip-syntax-backward "w_") |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2175 (setq from (point)))) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2176 ;; Look between `point' and `line-end-position'. |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2177 (save-excursion |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2178 (and (setq bound (line-end-position)) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2179 (skip-syntax-forward "^w_" bound) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2180 (< (setq from (point)) bound) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2181 (skip-syntax-forward "w_") |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2182 (setq to (point))))) |
6cd236e3935c
(find-tag-default): Simplify using exclusively
Martin Rudalics <rudalics@gmx.at>
parents:
87974
diff
changeset
|
2183 (buffer-substring-no-properties from to)))) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2184 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2185 (defun play-sound (sound) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2186 "SOUND is a list of the form `(sound KEYWORD VALUE...)'. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2187 The following keywords are recognized: |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2188 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2189 :file FILE - read sound data from FILE. If FILE isn't an |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2190 absolute file name, it is searched in `data-directory'. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2191 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2192 :data DATA - read sound data from string DATA. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2193 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2194 Exactly one of :file or :data must be present. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2195 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2196 :volume VOL - set volume to VOL. VOL must an integer in the |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2197 range 0..100 or a float in the range 0..1.0. If not specified, |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2198 don't change the volume setting of the sound device. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2199 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2200 :device DEVICE - play sound on DEVICE. If not specified, |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2201 a system-dependent default device name is used." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2202 (if (fboundp 'play-sound-internal) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2203 (play-sound-internal sound) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2204 (error "This Emacs binary lacks sound support"))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2205 |
86221
d6b46513e321
(w32-shell-dos-semantics): Declare as function.
Glenn Morris <rgm@gnu.org>
parents:
86172
diff
changeset
|
2206 (declare-function w32-shell-dos-semantics "w32-fns" nil) |
d6b46513e321
(w32-shell-dos-semantics): Declare as function.
Glenn Morris <rgm@gnu.org>
parents:
86172
diff
changeset
|
2207 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2208 (defun shell-quote-argument (argument) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2209 "Quote an argument for passing as argument to an inferior shell." |
73125
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2210 (if (or (eq system-type 'ms-dos) |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2211 (and (eq system-type 'windows-nt) (w32-shell-dos-semantics))) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2212 ;; Quote using double quotes, but escape any existing quotes in |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2213 ;; the argument with backslashes. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2214 (let ((result "") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2215 (start 0) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2216 end) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2217 (if (or (null (string-match "[^\"]" argument)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2218 (< (match-end 0) (length argument))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2219 (while (string-match "[\"]" argument start) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2220 (setq end (match-beginning 0) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2221 result (concat result (substring argument start end) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2222 "\\" (substring argument end (1+ end))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2223 start (1+ end)))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2224 (concat "\"" result (substring argument start) "\"")) |
73125
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2225 (if (equal argument "") |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2226 "''" |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2227 ;; Quote everything except POSIX filename characters. |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2228 ;; This should be safe enough even for really weird shells. |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2229 (let ((result "") (start 0) end) |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2230 (while (string-match "[^-0-9a-zA-Z_./]" argument start) |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2231 (setq end (match-beginning 0) |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2232 result (concat result (substring argument start end) |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2233 "\\" (substring argument end (1+ end))) |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2234 start (1+ end))) |
c637565b16e8
(shell-quote-argument): Use DOS logic for Windows shells with DOS semantics.
Jason Rumney <jasonr@gnu.org>
parents:
73028
diff
changeset
|
2235 (concat result (substring argument start)))))) |
69830
196122ba0b05
* subr.el (string-or-null-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69168
diff
changeset
|
2236 |
196122ba0b05
* subr.el (string-or-null-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69168
diff
changeset
|
2237 (defun string-or-null-p (object) |
196122ba0b05
* subr.el (string-or-null-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69168
diff
changeset
|
2238 "Return t if OBJECT is a string or nil. |
196122ba0b05
* subr.el (string-or-null-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69168
diff
changeset
|
2239 Otherwise, return nil." |
196122ba0b05
* subr.el (string-or-null-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69168
diff
changeset
|
2240 (or (stringp object) (null object))) |
196122ba0b05
* subr.el (string-or-null-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69168
diff
changeset
|
2241 |
70267
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
2242 (defun booleanp (object) |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
2243 "Return non-nil if OBJECT is one of the two canonical boolean values: t or nil." |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
2244 (memq object '(nil t))) |
a2c45c9f7e1f
(booleanp): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70229
diff
changeset
|
2245 |
70552
1121231ccc23
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-271
Miles Bader <miles@gnu.org>
parents:
70547
diff
changeset
|
2246 (defun field-at-pos (pos) |
70547
e184fae4f7dd
(field-at-point): New function.
Nick Roberts <nickrob@snap.net.nz>
parents:
70512
diff
changeset
|
2247 "Return the field at position POS, taking stickiness etc into account" |
e184fae4f7dd
(field-at-point): New function.
Nick Roberts <nickrob@snap.net.nz>
parents:
70512
diff
changeset
|
2248 (let ((raw-field (get-char-property (field-beginning pos) 'field))) |
e184fae4f7dd
(field-at-point): New function.
Nick Roberts <nickrob@snap.net.nz>
parents:
70512
diff
changeset
|
2249 (if (eq raw-field 'boundary) |
e184fae4f7dd
(field-at-point): New function.
Nick Roberts <nickrob@snap.net.nz>
parents:
70512
diff
changeset
|
2250 (get-char-property (1- (field-end pos)) 'field) |
e184fae4f7dd
(field-at-point): New function.
Nick Roberts <nickrob@snap.net.nz>
parents:
70512
diff
changeset
|
2251 raw-field))) |
e184fae4f7dd
(field-at-point): New function.
Nick Roberts <nickrob@snap.net.nz>
parents:
70512
diff
changeset
|
2252 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2253 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2254 ;;;; Support for yanking and text properties. |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
2255 |
44668
52222efc9d4d
(insert-for-yank): New function.
Richard M. Stallman <rms@gnu.org>
parents:
44473
diff
changeset
|
2256 (defvar yank-excluded-properties) |
52222efc9d4d
(insert-for-yank): New function.
Richard M. Stallman <rms@gnu.org>
parents:
44473
diff
changeset
|
2257 |
44980
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2258 (defun remove-yank-excluded-properties (start end) |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2259 "Remove `yank-excluded-properties' between START and END positions. |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2260 Replaces `category' properties with their defined properties." |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2261 (let ((inhibit-read-only t)) |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2262 ;; Replace any `category' property with the properties it stands for. |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2263 (unless (memq yank-excluded-properties '(t nil)) |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2264 (save-excursion |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2265 (goto-char start) |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2266 (while (< (point) end) |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2267 (let ((cat (get-text-property (point) 'category)) |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2268 run-end) |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2269 (setq run-end |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2270 (next-single-property-change (point) 'category nil end)) |
47675
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2271 (when cat |
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2272 (let (run-end2 original) |
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2273 (remove-list-of-text-properties (point) run-end '(category)) |
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2274 (while (< (point) run-end) |
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2275 (setq run-end2 (next-property-change (point) nil run-end)) |
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2276 (setq original (text-properties-at (point))) |
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2277 (set-text-properties (point) run-end2 (symbol-plist cat)) |
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2278 (add-text-properties (point) run-end2 original) |
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2279 (goto-char run-end2)))) |
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2280 (goto-char run-end))))) |
44980
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2281 (if (eq yank-excluded-properties t) |
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2282 (set-text-properties start end nil) |
47675
cb548fe4bcdb
(remove-yank-excluded-properties): Fix bugs in handling of category properties.
Richard M. Stallman <rms@gnu.org>
parents:
47652
diff
changeset
|
2283 (remove-list-of-text-properties start end yank-excluded-properties)))) |
44980
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2284 |
49310
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2285 (defvar yank-undo-function) |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2286 |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2287 (defun insert-for-yank (string) |
53368
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2288 "Calls `insert-for-yank-1' repetitively for each `yank-handler' segment. |
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2289 |
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2290 See `insert-for-yank-1' for more details." |
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2291 (let (to) |
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2292 (while (setq to (next-single-property-change 0 'yank-handler string)) |
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2293 (insert-for-yank-1 (substring string 0 to)) |
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2294 (setq string (substring string to)))) |
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2295 (insert-for-yank-1 string)) |
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2296 |
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2297 (defun insert-for-yank-1 (string) |
49310
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2298 "Insert STRING at point, stripping some text properties. |
53368
6dab9150c9e0
(insert-for-yank): Call insert-for-yank-1 repetitively
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53197
diff
changeset
|
2299 |
49310
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2300 Strip text properties from the inserted text according to |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2301 `yank-excluded-properties'. Otherwise just like (insert STRING). |
44723
f5b7b7055a64
(insert-buffer-substring-no-properties): New function.
Kim F. Storm <storm@cua.dk>
parents:
44668
diff
changeset
|
2302 |
49363 | 2303 If STRING has a non-nil `yank-handler' property on the first character, |
63258
bd20f5cf580f
(insert-for-yank-1): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63151
diff
changeset
|
2304 the normal insert behavior is modified in various ways. The value of |
65014
3aa61588445b
(insert-for-yank-1): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
64792
diff
changeset
|
2305 the yank-handler property must be a list with one to four elements |
49492
a144c40bb984
(insert-for-yank): Remove COMMAND element from yank handler.
Kim F. Storm <storm@cua.dk>
parents:
49363
diff
changeset
|
2306 with the following format: (FUNCTION PARAM NOEXCLUDE UNDO). |
49310
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2307 When FUNCTION is present and non-nil, it is called instead of `insert' |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2308 to insert the string. FUNCTION takes one argument--the object to insert. |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2309 If PARAM is present and non-nil, it replaces STRING as the object |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2310 passed to FUNCTION (or `insert'); for example, if FUNCTION is |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2311 `yank-rectangle', PARAM may be a list of strings to insert as a |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2312 rectangle. |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2313 If NOEXCLUDE is present and non-nil, the normal removal of the |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2314 yank-excluded-properties is not performed; instead FUNCTION is |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2315 responsible for removing those properties. This may be necessary |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2316 if FUNCTION adjusts point before or after inserting the object. |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2317 If UNDO is present and non-nil, it is a function that will be called |
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2318 by `yank-pop' to undo the insertion of the current object. It is |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49492
diff
changeset
|
2319 called with two arguments, the start and end of the current region. |
49492
a144c40bb984
(insert-for-yank): Remove COMMAND element from yank handler.
Kim F. Storm <storm@cua.dk>
parents:
49363
diff
changeset
|
2320 FUNCTION may set `yank-undo-function' to override the UNDO value." |
49318
63a122cc4286
(insert-for-yank): Set yank-undo-function after calling FUNCTION,
Kim F. Storm <storm@cua.dk>
parents:
49313
diff
changeset
|
2321 (let* ((handler (and (stringp string) |
63a122cc4286
(insert-for-yank): Set yank-undo-function after calling FUNCTION,
Kim F. Storm <storm@cua.dk>
parents:
49313
diff
changeset
|
2322 (get-text-property 0 'yank-handler string))) |
63a122cc4286
(insert-for-yank): Set yank-undo-function after calling FUNCTION,
Kim F. Storm <storm@cua.dk>
parents:
49313
diff
changeset
|
2323 (param (or (nth 1 handler) string)) |
73153
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2324 (opoint (point)) |
75748
8c99ad9fd6c0
(insert-for-yank-1): Prevent read-only properties from interfering
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
2325 (inhibit-read-only inhibit-read-only) |
73153
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2326 end) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2327 |
49318
63a122cc4286
(insert-for-yank): Set yank-undo-function after calling FUNCTION,
Kim F. Storm <storm@cua.dk>
parents:
49313
diff
changeset
|
2328 (setq yank-undo-function t) |
63a122cc4286
(insert-for-yank): Set yank-undo-function after calling FUNCTION,
Kim F. Storm <storm@cua.dk>
parents:
49313
diff
changeset
|
2329 (if (nth 0 handler) ;; FUNCTION |
63a122cc4286
(insert-for-yank): Set yank-undo-function after calling FUNCTION,
Kim F. Storm <storm@cua.dk>
parents:
49313
diff
changeset
|
2330 (funcall (car handler) param) |
49310
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2331 (insert param)) |
73153
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2332 (setq end (point)) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2333 |
75748
8c99ad9fd6c0
(insert-for-yank-1): Prevent read-only properties from interfering
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
2334 ;; Prevent read-only properties from interfering with the |
8c99ad9fd6c0
(insert-for-yank-1): Prevent read-only properties from interfering
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
2335 ;; following text property changes. |
8c99ad9fd6c0
(insert-for-yank-1): Prevent read-only properties from interfering
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
2336 (setq inhibit-read-only t) |
8c99ad9fd6c0
(insert-for-yank-1): Prevent read-only properties from interfering
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
2337 |
73153
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2338 ;; What should we do with `font-lock-face' properties? |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2339 (if font-lock-defaults |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2340 ;; No, just wipe them. |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2341 (remove-list-of-text-properties opoint end '(font-lock-face)) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2342 ;; Convert them to `face'. |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2343 (save-excursion |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2344 (goto-char opoint) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2345 (while (< (point) end) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2346 (let ((face (get-text-property (point) 'font-lock-face)) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2347 run-end) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2348 (setq run-end |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2349 (next-single-property-change (point) 'font-lock-face nil end)) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2350 (when face |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2351 (remove-text-properties (point) run-end '(font-lock-face nil)) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2352 (put-text-property (point) run-end 'face face)) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2353 (goto-char run-end))))) |
d18b30d3454b
(insert-for-yank-1): Handle `font-lock-face' specially.
Richard M. Stallman <rms@gnu.org>
parents:
73125
diff
changeset
|
2354 |
49318
63a122cc4286
(insert-for-yank): Set yank-undo-function after calling FUNCTION,
Kim F. Storm <storm@cua.dk>
parents:
49313
diff
changeset
|
2355 (unless (nth 2 handler) ;; NOEXCLUDE |
49310
32fe2d888907
(insert-for-yank): Arg list changed; now only accepts one
Kim F. Storm <storm@cua.dk>
parents:
49225
diff
changeset
|
2356 (remove-yank-excluded-properties opoint (point))) |
73415
56ea5a847db0
(insert-for-yank-1): If last inserted char has properties,
Richard M. Stallman <rms@gnu.org>
parents:
73357
diff
changeset
|
2357 |
56ea5a847db0
(insert-for-yank-1): If last inserted char has properties,
Richard M. Stallman <rms@gnu.org>
parents:
73357
diff
changeset
|
2358 ;; If last inserted char has properties, mark them as rear-nonsticky. |
56ea5a847db0
(insert-for-yank-1): If last inserted char has properties,
Richard M. Stallman <rms@gnu.org>
parents:
73357
diff
changeset
|
2359 (if (and (> end opoint) |
56ea5a847db0
(insert-for-yank-1): If last inserted char has properties,
Richard M. Stallman <rms@gnu.org>
parents:
73357
diff
changeset
|
2360 (text-properties-at (1- end))) |
56ea5a847db0
(insert-for-yank-1): If last inserted char has properties,
Richard M. Stallman <rms@gnu.org>
parents:
73357
diff
changeset
|
2361 (put-text-property (1- end) end 'rear-nonsticky t)) |
56ea5a847db0
(insert-for-yank-1): If last inserted char has properties,
Richard M. Stallman <rms@gnu.org>
parents:
73357
diff
changeset
|
2362 |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
2363 (if (eq yank-undo-function t) ;; not set by FUNCTION |
49318
63a122cc4286
(insert-for-yank): Set yank-undo-function after calling FUNCTION,
Kim F. Storm <storm@cua.dk>
parents:
49313
diff
changeset
|
2364 (setq yank-undo-function (nth 3 handler))) ;; UNDO |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
2365 (if (nth 4 handler) ;; COMMAND |
49318
63a122cc4286
(insert-for-yank): Set yank-undo-function after calling FUNCTION,
Kim F. Storm <storm@cua.dk>
parents:
49313
diff
changeset
|
2366 (setq this-command (nth 4 handler))))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49492
diff
changeset
|
2367 |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2368 (defun insert-buffer-substring-no-properties (buffer &optional start end) |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2369 "Insert before point a substring of BUFFER, without text properties. |
44723
f5b7b7055a64
(insert-buffer-substring-no-properties): New function.
Kim F. Storm <storm@cua.dk>
parents:
44668
diff
changeset
|
2370 BUFFER may be a buffer or a buffer name. |
55976
bb7bcfc53d76
(insert-buffer-substring-no-properties, insert-buffer-substring-as-yank):
Juanma Barranquero <lekktu@gmail.com>
parents:
55891
diff
changeset
|
2371 Arguments START and END are character positions specifying the substring. |
bb7bcfc53d76
(insert-buffer-substring-no-properties, insert-buffer-substring-as-yank):
Juanma Barranquero <lekktu@gmail.com>
parents:
55891
diff
changeset
|
2372 They default to the values of (point-min) and (point-max) in BUFFER." |
44723
f5b7b7055a64
(insert-buffer-substring-no-properties): New function.
Kim F. Storm <storm@cua.dk>
parents:
44668
diff
changeset
|
2373 (let ((opoint (point))) |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2374 (insert-buffer-substring buffer start end) |
44723
f5b7b7055a64
(insert-buffer-substring-no-properties): New function.
Kim F. Storm <storm@cua.dk>
parents:
44668
diff
changeset
|
2375 (let ((inhibit-read-only t)) |
f5b7b7055a64
(insert-buffer-substring-no-properties): New function.
Kim F. Storm <storm@cua.dk>
parents:
44668
diff
changeset
|
2376 (set-text-properties opoint (point) nil)))) |
f5b7b7055a64
(insert-buffer-substring-no-properties): New function.
Kim F. Storm <storm@cua.dk>
parents:
44668
diff
changeset
|
2377 |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2378 (defun insert-buffer-substring-as-yank (buffer &optional start end) |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2379 "Insert before point a part of BUFFER, stripping some text properties. |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2380 BUFFER may be a buffer or a buffer name. |
55976
bb7bcfc53d76
(insert-buffer-substring-no-properties, insert-buffer-substring-as-yank):
Juanma Barranquero <lekktu@gmail.com>
parents:
55891
diff
changeset
|
2381 Arguments START and END are character positions specifying the substring. |
bb7bcfc53d76
(insert-buffer-substring-no-properties, insert-buffer-substring-as-yank):
Juanma Barranquero <lekktu@gmail.com>
parents:
55891
diff
changeset
|
2382 They default to the values of (point-min) and (point-max) in BUFFER. |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2383 Strip text properties from the inserted text according to |
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2384 `yank-excluded-properties'." |
52379 | 2385 ;; Since the buffer text should not normally have yank-handler properties, |
2386 ;; there is no need to handle them here. | |
44723
f5b7b7055a64
(insert-buffer-substring-no-properties): New function.
Kim F. Storm <storm@cua.dk>
parents:
44668
diff
changeset
|
2387 (let ((opoint (point))) |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2388 (insert-buffer-substring buffer start end) |
44980
5eb4aa56b278
(remove-yank-excluded-properties): New helper function.
Kim F. Storm <storm@cua.dk>
parents:
44945
diff
changeset
|
2389 (remove-yank-excluded-properties opoint (point)))) |
44723
f5b7b7055a64
(insert-buffer-substring-no-properties): New function.
Kim F. Storm <storm@cua.dk>
parents:
44668
diff
changeset
|
2390 |
44668
52222efc9d4d
(insert-for-yank): New function.
Richard M. Stallman <rms@gnu.org>
parents:
44473
diff
changeset
|
2391 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2392 ;;;; Synchronous shell commands. |
44668
52222efc9d4d
(insert-for-yank): New function.
Richard M. Stallman <rms@gnu.org>
parents:
44473
diff
changeset
|
2393 |
114 | 2394 (defun start-process-shell-command (name buffer &rest args) |
2395 "Start a program in a subprocess. Return the process object for it. | |
2396 NAME is name for process. It is modified if necessary to make it unique. | |
55502
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
2397 BUFFER is the buffer (or buffer name) to associate with the process. |
114 | 2398 Process output goes at end of that buffer, unless you specify |
2399 an output stream or filter function to handle the output. | |
2400 BUFFER may be also nil, meaning that this process is not associated | |
2401 with any buffer | |
55502
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
2402 COMMAND is the name of a shell command. |
73357
d62e39d56ebb
(start-process-shell-command): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
73153
diff
changeset
|
2403 Remaining arguments are the arguments for the command; they are all |
d62e39d56ebb
(start-process-shell-command): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
73153
diff
changeset
|
2404 spliced together with blanks separating between each two of them, before |
d62e39d56ebb
(start-process-shell-command): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
73153
diff
changeset
|
2405 passing the command to the shell. |
55502
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
2406 Wildcards and redirection are handled as usual in the shell. |
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
2407 |
75efe89a09b7
(start-process-shell-command): Fix docstring. Put usage info in a format usable
Juanma Barranquero <lekktu@gmail.com>
parents:
55477
diff
changeset
|
2408 \(fn NAME BUFFER COMMAND &rest COMMAND-ARGS)" |
9822
248462096d25
(start-process-shell-command): Don't use exec on windows-nt.
Karl Heuer <kwzh@gnu.org>
parents:
9535
diff
changeset
|
2409 (cond |
248462096d25
(start-process-shell-command): Don't use exec on windows-nt.
Karl Heuer <kwzh@gnu.org>
parents:
9535
diff
changeset
|
2410 ((eq system-type 'vax-vms) |
248462096d25
(start-process-shell-command): Don't use exec on windows-nt.
Karl Heuer <kwzh@gnu.org>
parents:
9535
diff
changeset
|
2411 (apply 'start-process name buffer args)) |
10025
3b058e13d177
(start-process-shell-command): Don't use `exec'--
Richard M. Stallman <rms@gnu.org>
parents:
9986
diff
changeset
|
2412 ;; We used to use `exec' to replace the shell with the command, |
3b058e13d177
(start-process-shell-command): Don't use `exec'--
Richard M. Stallman <rms@gnu.org>
parents:
9986
diff
changeset
|
2413 ;; but that failed to handle (...) and semicolon, etc. |
9822
248462096d25
(start-process-shell-command): Don't use exec on windows-nt.
Karl Heuer <kwzh@gnu.org>
parents:
9535
diff
changeset
|
2414 (t |
248462096d25
(start-process-shell-command): Don't use exec on windows-nt.
Karl Heuer <kwzh@gnu.org>
parents:
9535
diff
changeset
|
2415 (start-process name buffer shell-file-name shell-command-switch |
10025
3b058e13d177
(start-process-shell-command): Don't use `exec'--
Richard M. Stallman <rms@gnu.org>
parents:
9986
diff
changeset
|
2416 (mapconcat 'identity args " "))))) |
39598
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2417 |
82094
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2418 (defun start-file-process-shell-command (name buffer &rest args) |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2419 "Start a program in a subprocess. Return the process object for it. |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2420 Similar to `start-process-shell-command', but calls `start-file-process'." |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2421 (start-file-process |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2422 name buffer |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2423 (if (file-remote-p default-directory) "/bin/sh" shell-file-name) |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2424 (if (file-remote-p default-directory) "-c" shell-command-switch) |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2425 (mapconcat 'identity args " "))) |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2426 |
39598
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2427 (defun call-process-shell-command (command &optional infile buffer display |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2428 &rest args) |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2429 "Execute the shell command COMMAND synchronously in separate process. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2430 The remaining arguments are optional. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2431 The program's input comes from file INFILE (nil means `/dev/null'). |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2432 Insert output in BUFFER before point; t means current buffer; |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2433 nil for BUFFER means discard it; 0 means discard and don't wait. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2434 BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2435 REAL-BUFFER says what to do with standard output, as above, |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2436 while STDERR-FILE says what to do with standard error in the child. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2437 STDERR-FILE may be nil (discard standard error output), |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2438 t (mix it with ordinary output), or a file name string. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2439 |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2440 Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2441 Remaining arguments are strings passed as additional arguments for COMMAND. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2442 Wildcards and redirection are handled as usual in the shell. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2443 |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2444 If BUFFER is 0, `call-process-shell-command' returns immediately with value nil. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2445 Otherwise it waits for COMMAND to terminate and returns a numeric exit |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2446 status or a signal description string. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2447 If you quit, the process is killed with SIGINT, or SIGKILL if you quit again." |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2448 (cond |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2449 ((eq system-type 'vax-vms) |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2450 (apply 'call-process command infile buffer display args)) |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2451 ;; We used to use `exec' to replace the shell with the command, |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2452 ;; but that failed to handle (...) and semicolon, etc. |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2453 (t |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2454 (call-process shell-file-name |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2455 infile buffer display |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2456 shell-command-switch |
67884544e4c8
(call-process-shell-command): New function.
Miles Bader <miles@gnu.org>
parents:
39557
diff
changeset
|
2457 (mapconcat 'identity (cons command args) " "))))) |
82094
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2458 |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2459 (defun process-file-shell-command (command &optional infile buffer display |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2460 &rest args) |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2461 "Process files synchronously in a separate process. |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2462 Similar to `call-process-shell-command', but calls `process-file'." |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2463 (process-file |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2464 (if (file-remote-p default-directory) "/bin/sh" shell-file-name) |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2465 infile buffer display |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2466 (if (file-remote-p default-directory) "-c" shell-command-switch) |
76546b143f2d
* subr.el (start-file-process-shell-command)
Michael Albinus <michael.albinus@gmx.de>
parents:
81863
diff
changeset
|
2467 (mapconcat 'identity (cons command args) " "))) |
16359
18cc78dc8b18
(with-temp-file): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16333
diff
changeset
|
2468 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2469 ;;;; Lisp macros to do various things temporarily. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2470 |
16277
bbddbc86b82b
(with-current-buffer): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
15983
diff
changeset
|
2471 (defmacro with-current-buffer (buffer &rest body) |
71151
207dba45f18e
(with-current-buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71078
diff
changeset
|
2472 "Execute the forms in BODY with BUFFER temporarily current. |
71078
e917fe503f6c
(with-current-buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71037
diff
changeset
|
2473 BUFFER can be a buffer or a buffer name. |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2474 The value returned is the value of the last form in BODY. |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2475 See also `with-temp-buffer'." |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2476 (declare (indent 1) (debug t)) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2477 `(save-current-buffer |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2478 (set-buffer ,buffer) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2479 ,@body)) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2480 |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2481 (defmacro with-selected-window (window &rest body) |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2482 "Execute the forms in BODY with WINDOW as the selected window. |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2483 The value returned is the value of the last form in BODY. |
63761
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2484 |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2485 This macro saves and restores the current buffer, since otherwise |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2486 its normal operation could potentially make a different |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2487 buffer current. It does not alter the buffer list ordering. |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2488 |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2489 This macro saves and restores the selected window, as well as |
56402
78189fca7611
(with-selected-window): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56398
diff
changeset
|
2490 the selected window in each frame. If the previously selected |
78189fca7611
(with-selected-window): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56398
diff
changeset
|
2491 window of some frame is no longer live at the end of BODY, that |
78189fca7611
(with-selected-window): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56398
diff
changeset
|
2492 frame's selected window is left alone. If the selected window is |
78189fca7611
(with-selected-window): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56398
diff
changeset
|
2493 no longer live, then whatever window is selected at the end of |
78189fca7611
(with-selected-window): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56398
diff
changeset
|
2494 BODY remains selected. |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2495 See also `with-temp-buffer'." |
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2496 (declare (indent 1) (debug t)) |
55828
af9432138635
(with-selected-window): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
55812
diff
changeset
|
2497 ;; Most of this code is a copy of save-selected-window. |
af9432138635
(with-selected-window): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
55812
diff
changeset
|
2498 `(let ((save-selected-window-window (selected-window)) |
af9432138635
(with-selected-window): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
55812
diff
changeset
|
2499 ;; It is necessary to save all of these, because calling |
af9432138635
(with-selected-window): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
55812
diff
changeset
|
2500 ;; select-window changes frame-selected-window for whatever |
af9432138635
(with-selected-window): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
55812
diff
changeset
|
2501 ;; frame that window is in. |
af9432138635
(with-selected-window): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
55812
diff
changeset
|
2502 (save-selected-window-alist |
af9432138635
(with-selected-window): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
55812
diff
changeset
|
2503 (mapcar (lambda (frame) (list frame (frame-selected-window frame))) |
af9432138635
(with-selected-window): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
55812
diff
changeset
|
2504 (frame-list)))) |
63761
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2505 (save-current-buffer |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2506 (unwind-protect |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2507 (progn (select-window ,window 'norecord) |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2508 ,@body) |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2509 (dolist (elt save-selected-window-alist) |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2510 (and (frame-live-p (car elt)) |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2511 (window-live-p (cadr elt)) |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2512 (set-frame-selected-window (car elt) (cadr elt)))) |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2513 (if (window-live-p save-selected-window-window) |
f14d5e7e60e1
(with-selected-window): Use save-current-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
63664
diff
changeset
|
2514 (select-window save-selected-window-window 'norecord)))))) |
16277
bbddbc86b82b
(with-current-buffer): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
15983
diff
changeset
|
2515 |
83128
2ccd88cfde01
New control structure: with-selected-frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
55520
diff
changeset
|
2516 (defmacro with-selected-frame (frame &rest body) |
2ccd88cfde01
New control structure: with-selected-frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
55520
diff
changeset
|
2517 "Execute the forms in BODY with FRAME as the selected frame. |
2ccd88cfde01
New control structure: with-selected-frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
55520
diff
changeset
|
2518 The value returned is the value of the last form in BODY. |
2ccd88cfde01
New control structure: with-selected-frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
55520
diff
changeset
|
2519 See also `with-temp-buffer'." |
2ccd88cfde01
New control structure: with-selected-frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
55520
diff
changeset
|
2520 (declare (indent 1) (debug t)) |
83488
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2521 (let ((old-frame (make-symbol "old-frame")) |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2522 (old-buffer (make-symbol "old-buffer"))) |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2523 `(let ((,old-frame (selected-frame)) |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2524 (,old-buffer (current-buffer))) |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2525 (unwind-protect |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2526 (progn (select-frame ,frame) |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2527 ,@body) |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2528 (if (frame-live-p ,old-frame) |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2529 (select-frame ,old-frame)) |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2530 (if (buffer-live-p ,old-buffer) |
f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83483
diff
changeset
|
2531 (set-buffer ,old-buffer)))))) |
83128
2ccd88cfde01
New control structure: with-selected-frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
55520
diff
changeset
|
2532 |
23736 | 2533 (defmacro with-temp-file (file &rest body) |
2534 "Create a new buffer, evaluate BODY there, and write the buffer to FILE. | |
2535 The value returned is the value of the last form in BODY. | |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2536 See also `with-temp-buffer'." |
51611
d201fdadadce
(looking-back): Handle the case of non-trivial regexps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51339
diff
changeset
|
2537 (declare (debug t)) |
16359
18cc78dc8b18
(with-temp-file): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16333
diff
changeset
|
2538 (let ((temp-file (make-symbol "temp-file")) |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2539 (temp-buffer (make-symbol "temp-buffer"))) |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2540 `(let ((,temp-file ,file) |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2541 (,temp-buffer |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2542 (get-buffer-create (generate-new-buffer-name " *temp file*")))) |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2543 (unwind-protect |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2544 (prog1 |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2545 (with-current-buffer ,temp-buffer |
23736 | 2546 ,@body) |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2547 (with-current-buffer ,temp-buffer |
95366
52e3cee99f90
* progmodes/flymake.el (flymake-save-buffer-in-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94703
diff
changeset
|
2548 (write-region nil nil ,temp-file nil 0))) |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2549 (and (buffer-name ,temp-buffer) |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2550 (kill-buffer ,temp-buffer)))))) |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2551 |
23736 | 2552 (defmacro with-temp-message (message &rest body) |
24011 | 2553 "Display MESSAGE temporarily if non-nil while BODY is evaluated. |
23736 | 2554 The original message is restored to the echo area after BODY has finished. |
2555 The value returned is the value of the last form in BODY. | |
24011 | 2556 MESSAGE is written to the message log buffer if `message-log-max' is non-nil. |
2557 If MESSAGE is nil, the echo area and message log buffer are unchanged. | |
2558 Use a MESSAGE of \"\" to temporarily clear the echo area." | |
51611
d201fdadadce
(looking-back): Handle the case of non-trivial regexps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51339
diff
changeset
|
2559 (declare (debug t)) |
24000
2de7db40964d
(with-temp-message): Don't display MESSAGE if nil.
Simon Marshall <simon@gnu.org>
parents:
23907
diff
changeset
|
2560 (let ((current-message (make-symbol "current-message")) |
2de7db40964d
(with-temp-message): Don't display MESSAGE if nil.
Simon Marshall <simon@gnu.org>
parents:
23907
diff
changeset
|
2561 (temp-message (make-symbol "with-temp-message"))) |
2de7db40964d
(with-temp-message): Don't display MESSAGE if nil.
Simon Marshall <simon@gnu.org>
parents:
23907
diff
changeset
|
2562 `(let ((,temp-message ,message) |
2de7db40964d
(with-temp-message): Don't display MESSAGE if nil.
Simon Marshall <simon@gnu.org>
parents:
23907
diff
changeset
|
2563 (,current-message)) |
23736 | 2564 (unwind-protect |
2565 (progn | |
24000
2de7db40964d
(with-temp-message): Don't display MESSAGE if nil.
Simon Marshall <simon@gnu.org>
parents:
23907
diff
changeset
|
2566 (when ,temp-message |
2de7db40964d
(with-temp-message): Don't display MESSAGE if nil.
Simon Marshall <simon@gnu.org>
parents:
23907
diff
changeset
|
2567 (setq ,current-message (current-message)) |
24699
1ce8c890309e
(with-temp-message): Fix the other call to message to use %s.
Karl Heuer <kwzh@gnu.org>
parents:
24385
diff
changeset
|
2568 (message "%s" ,temp-message)) |
23736 | 2569 ,@body) |
42076
d6765861f6ea
(with-temp-message): At the end, always discard
Richard M. Stallman <rms@gnu.org>
parents:
41975
diff
changeset
|
2570 (and ,temp-message |
d6765861f6ea
(with-temp-message): At the end, always discard
Richard M. Stallman <rms@gnu.org>
parents:
41975
diff
changeset
|
2571 (if ,current-message |
d6765861f6ea
(with-temp-message): At the end, always discard
Richard M. Stallman <rms@gnu.org>
parents:
41975
diff
changeset
|
2572 (message "%s" ,current-message) |
d6765861f6ea
(with-temp-message): At the end, always discard
Richard M. Stallman <rms@gnu.org>
parents:
41975
diff
changeset
|
2573 (message nil))))))) |
23736 | 2574 |
2575 (defmacro with-temp-buffer (&rest body) | |
2576 "Create a temporary buffer, and evaluate BODY there like `progn'. | |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2577 See also `with-temp-file' and `with-output-to-string'." |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2578 (declare (indent 0) (debug t)) |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2579 (let ((temp-buffer (make-symbol "temp-buffer"))) |
57480
db7d00351c33
(substitute-key-definition-key): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57438
diff
changeset
|
2580 `(let ((,temp-buffer (generate-new-buffer " *temp*"))) |
93396
c15f559a5ada
(with-temp-buffer): Assume kill-buffer can change current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
2581 ;; FIXME: kill-buffer can change current-buffer in some odd cases. |
c15f559a5ada
(with-temp-buffer): Assume kill-buffer can change current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
2582 (with-current-buffer ,temp-buffer |
c15f559a5ada
(with-temp-buffer): Assume kill-buffer can change current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
2583 (unwind-protect |
c15f559a5ada
(with-temp-buffer): Assume kill-buffer can change current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
2584 (progn ,@body) |
c15f559a5ada
(with-temp-buffer): Assume kill-buffer can change current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
2585 (and (buffer-name ,temp-buffer) |
c15f559a5ada
(with-temp-buffer): Assume kill-buffer can change current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
2586 (kill-buffer ,temp-buffer))))))) |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2587 |
16311
a56a8c6f2d8f
(with-output-to-string): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16294
diff
changeset
|
2588 (defmacro with-output-to-string (&rest body) |
a56a8c6f2d8f
(with-output-to-string): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16294
diff
changeset
|
2589 "Execute BODY, return the text it sent to `standard-output', as a string." |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2590 (declare (indent 0) (debug t)) |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2591 `(let ((standard-output |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2592 (get-buffer-create (generate-new-buffer-name " *string-output*")))) |
16311
a56a8c6f2d8f
(with-output-to-string): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16294
diff
changeset
|
2593 (let ((standard-output standard-output)) |
a56a8c6f2d8f
(with-output-to-string): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16294
diff
changeset
|
2594 ,@body) |
16379
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2595 (with-current-buffer standard-output |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2596 (prog1 |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2597 (buffer-string) |
dcc3625f52e2
(with-current-buffer): Minor cleanup.
Erik Naggum <erik@naggum.no>
parents:
16359
diff
changeset
|
2598 (kill-buffer nil))))) |
16549
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2599 |
40822
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
2600 (defmacro with-local-quit (&rest body) |
56565
1bef61b14e78
(with-local-quit): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56537
diff
changeset
|
2601 "Execute BODY, allowing quits to terminate BODY but not escape further. |
57547
5d572f497d32
(with-local-quit): Return nil if there's a quit.
Richard M. Stallman <rms@gnu.org>
parents:
57523
diff
changeset
|
2602 When a quit terminates BODY, `with-local-quit' returns nil but |
70903
fe6029063ab4
(with-local-quit): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70901
diff
changeset
|
2603 requests another quit. That quit will be processed as soon as quitting |
fe6029063ab4
(with-local-quit): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70901
diff
changeset
|
2604 is allowed once again. (Immediately, if `inhibit-quit' is nil.)" |
48475
4bdcb09d9f25
(symbol-file): Accept a non-atomic `function' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48474
diff
changeset
|
2605 (declare (debug t) (indent 0)) |
40822
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
2606 `(condition-case nil |
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
2607 (let ((inhibit-quit nil)) |
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
2608 ,@body) |
70901
cc60343f8fd6
(with-local-quit): When handling `quit' signal,
Richard M. Stallman <rms@gnu.org>
parents:
70897
diff
changeset
|
2609 (quit (setq quit-flag t) |
cc60343f8fd6
(with-local-quit): When handling `quit' signal,
Richard M. Stallman <rms@gnu.org>
parents:
70897
diff
changeset
|
2610 ;; This call is to give a chance to handle quit-flag |
cc60343f8fd6
(with-local-quit): When handling `quit' signal,
Richard M. Stallman <rms@gnu.org>
parents:
70897
diff
changeset
|
2611 ;; in case inhibit-quit is nil. |
cc60343f8fd6
(with-local-quit): When handling `quit' signal,
Richard M. Stallman <rms@gnu.org>
parents:
70897
diff
changeset
|
2612 ;; Without this, it will not be handled until the next function |
cc60343f8fd6
(with-local-quit): When handling `quit' signal,
Richard M. Stallman <rms@gnu.org>
parents:
70897
diff
changeset
|
2613 ;; call, and that might allow it to exit thru a condition-case |
cc60343f8fd6
(with-local-quit): When handling `quit' signal,
Richard M. Stallman <rms@gnu.org>
parents:
70897
diff
changeset
|
2614 ;; that intends to handle the quit signal next time. |
cc60343f8fd6
(with-local-quit): When handling `quit' signal,
Richard M. Stallman <rms@gnu.org>
parents:
70897
diff
changeset
|
2615 (eval '(ignore nil))))) |
40822
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
2616 |
58934
ee02b41be7da
(while-no-input): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
58800
diff
changeset
|
2617 (defmacro while-no-input (&rest body) |
ee02b41be7da
(while-no-input): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
58800
diff
changeset
|
2618 "Execute BODY only as long as there's no pending input. |
ee02b41be7da
(while-no-input): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
58800
diff
changeset
|
2619 If input arrives, that ends the execution of BODY, |
64792
f309b64476da
(while-no-input): Return t if there is input.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2620 and `while-no-input' returns t. Quitting makes it return nil. |
f309b64476da
(while-no-input): Return t if there is input.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
2621 If BODY finishes, `while-no-input' returns whatever value BODY produced." |
58934
ee02b41be7da
(while-no-input): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
58800
diff
changeset
|
2622 (declare (debug t) (indent 0)) |
ee02b41be7da
(while-no-input): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
58800
diff
changeset
|
2623 (let ((catch-sym (make-symbol "input"))) |
ee02b41be7da
(while-no-input): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
58800
diff
changeset
|
2624 `(with-local-quit |
ee02b41be7da
(while-no-input): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
58800
diff
changeset
|
2625 (catch ',catch-sym |
ee02b41be7da
(while-no-input): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
58800
diff
changeset
|
2626 (let ((throw-on-input ',catch-sym)) |
72817
b70548506872
(sit-for): Rework to use input-pending-p and cond.
Kim F. Storm <storm@cua.dk>
parents:
72784
diff
changeset
|
2627 (or (input-pending-p) |
92621
f32191b4080d
(while-no-input): Don't splice BODY directly into the `or' form.
Johan Bockgård <bojohan@gnu.org>
parents:
92498
diff
changeset
|
2628 (progn ,@body))))))) |
58934
ee02b41be7da
(while-no-input): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
58800
diff
changeset
|
2629 |
81803
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2630 (defmacro condition-case-no-debug (var bodyform &rest handlers) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2631 "Like `condition-case' except that it does not catch anything when debugging. |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2632 More specifically if `debug-on-error' is set, then it does not catch any signal." |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2633 (declare (debug condition-case) (indent 2)) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2634 (let ((bodysym (make-symbol "body"))) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2635 `(let ((,bodysym (lambda () ,bodyform))) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2636 (if debug-on-error |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2637 (funcall ,bodysym) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2638 (condition-case ,var |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2639 (funcall ,bodysym) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2640 ,@handlers))))) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2641 |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2642 (defmacro with-demoted-errors (&rest body) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2643 "Run BODY and demote any errors to simple messages. |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2644 If `debug-on-error' is non-nil, run BODY without catching its errors. |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2645 This is to be used around code which is not expected to signal an error |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2646 but which should be robust in the unexpected case that an error is signalled." |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2647 (declare (debug t) (indent 0)) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2648 (let ((err (make-symbol "err"))) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2649 `(condition-case-no-debug ,err |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2650 (progn ,@body) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2651 (error (message "Error: %s" ,err) nil)))) |
f7d2bfbd3abc
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81783
diff
changeset
|
2652 |
16549
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2653 (defmacro combine-after-change-calls (&rest body) |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2654 "Execute BODY, but don't call the after-change functions till the end. |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2655 If BODY makes changes in the buffer, they are recorded |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2656 and the functions on `after-change-functions' are called several times |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2657 when BODY is finished. |
17146
b8536e42d4ef
(combine-after-change-calls): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
16845
diff
changeset
|
2658 The return value is the value of the last form in BODY. |
16549
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2659 |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2660 If `before-change-functions' is non-nil, then calls to the after-change |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2661 functions can't be deferred, so in that case this macro has no effect. |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2662 |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2663 Do not alter `after-change-functions' or `before-change-functions' |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2664 in BODY." |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2665 (declare (indent 0) (debug t)) |
16549
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2666 `(unwind-protect |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2667 (let ((combine-after-change-calls t)) |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2668 . ,body) |
30ddd0e52ace
(combine-after-change-calls): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16437
diff
changeset
|
2669 (combine-after-change-execute))) |
76939
1b8e8619079e
* subr.el (with-case-table): New macro.
Chong Yidong <cyd@stupidchicken.com>
parents:
76583
diff
changeset
|
2670 |
1b8e8619079e
* subr.el (with-case-table): New macro.
Chong Yidong <cyd@stupidchicken.com>
parents:
76583
diff
changeset
|
2671 (defmacro with-case-table (table &rest body) |
1b8e8619079e
* subr.el (with-case-table): New macro.
Chong Yidong <cyd@stupidchicken.com>
parents:
76583
diff
changeset
|
2672 "Execute the forms in BODY with TABLE as the current case table. |
1b8e8619079e
* subr.el (with-case-table): New macro.
Chong Yidong <cyd@stupidchicken.com>
parents:
76583
diff
changeset
|
2673 The value returned is the value of the last form in BODY." |
1b8e8619079e
* subr.el (with-case-table): New macro.
Chong Yidong <cyd@stupidchicken.com>
parents:
76583
diff
changeset
|
2674 (declare (indent 1) (debug t)) |
76960
85841d693997
(with-case-table): Use `make-symbol' to avoid variable capture.
John Paul Wallington <jpw@pobox.com>
parents:
76939
diff
changeset
|
2675 (let ((old-case-table (make-symbol "table")) |
85841d693997
(with-case-table): Use `make-symbol' to avoid variable capture.
John Paul Wallington <jpw@pobox.com>
parents:
76939
diff
changeset
|
2676 (old-buffer (make-symbol "buffer"))) |
85841d693997
(with-case-table): Use `make-symbol' to avoid variable capture.
John Paul Wallington <jpw@pobox.com>
parents:
76939
diff
changeset
|
2677 `(let ((,old-case-table (current-case-table)) |
85841d693997
(with-case-table): Use `make-symbol' to avoid variable capture.
John Paul Wallington <jpw@pobox.com>
parents:
76939
diff
changeset
|
2678 (,old-buffer (current-buffer))) |
85841d693997
(with-case-table): Use `make-symbol' to avoid variable capture.
John Paul Wallington <jpw@pobox.com>
parents:
76939
diff
changeset
|
2679 (unwind-protect |
85841d693997
(with-case-table): Use `make-symbol' to avoid variable capture.
John Paul Wallington <jpw@pobox.com>
parents:
76939
diff
changeset
|
2680 (progn (set-case-table ,table) |
85841d693997
(with-case-table): Use `make-symbol' to avoid variable capture.
John Paul Wallington <jpw@pobox.com>
parents:
76939
diff
changeset
|
2681 ,@body) |
85841d693997
(with-case-table): Use `make-symbol' to avoid variable capture.
John Paul Wallington <jpw@pobox.com>
parents:
76939
diff
changeset
|
2682 (with-current-buffer ,old-buffer |
85841d693997
(with-case-table): Use `make-symbol' to avoid variable capture.
John Paul Wallington <jpw@pobox.com>
parents:
76939
diff
changeset
|
2683 (set-case-table ,old-case-table)))))) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2684 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2685 ;;; Matching and match data. |
44668
52222efc9d4d
(insert-for-yank): New function.
Richard M. Stallman <rms@gnu.org>
parents:
44473
diff
changeset
|
2686 |
15955
32d772cba2c1
(save-match-data): Use save-match-data-internal
Richard M. Stallman <rms@gnu.org>
parents:
15894
diff
changeset
|
2687 (defvar save-match-data-internal) |
32d772cba2c1
(save-match-data): Use save-match-data-internal
Richard M. Stallman <rms@gnu.org>
parents:
15894
diff
changeset
|
2688 |
32d772cba2c1
(save-match-data): Use save-match-data-internal
Richard M. Stallman <rms@gnu.org>
parents:
15894
diff
changeset
|
2689 ;; We use save-match-data-internal as the local variable because |
32d772cba2c1
(save-match-data): Use save-match-data-internal
Richard M. Stallman <rms@gnu.org>
parents:
15894
diff
changeset
|
2690 ;; that works ok in practice (people should not use that variable elsewhere). |
32d772cba2c1
(save-match-data): Use save-match-data-internal
Richard M. Stallman <rms@gnu.org>
parents:
15894
diff
changeset
|
2691 ;; We used to use an uninterned symbol; the compiler handles that properly |
32d772cba2c1
(save-match-data): Use save-match-data-internal
Richard M. Stallman <rms@gnu.org>
parents:
15894
diff
changeset
|
2692 ;; now, but it generates slower code. |
2504
181eef669324
* subr.el (overlay-start, overlay-end, overlay-buffer): New
Jim Blandy <jimb@redhat.com>
parents:
2428
diff
changeset
|
2693 (defmacro save-match-data (&rest body) |
43527
d51d403fd80a
(save-match-data): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
43498
diff
changeset
|
2694 "Execute the BODY forms, restoring the global value of the match data. |
d51d403fd80a
(save-match-data): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
43498
diff
changeset
|
2695 The value returned is the value of the last form in BODY." |
26084
804cba424b64
Fix bootstrapping problems.
Paul Eggert <eggert@twinsun.com>
parents:
26002
diff
changeset
|
2696 ;; It is better not to use backquote here, |
804cba424b64
Fix bootstrapping problems.
Paul Eggert <eggert@twinsun.com>
parents:
26002
diff
changeset
|
2697 ;; because that makes a bootstrapping problem |
804cba424b64
Fix bootstrapping problems.
Paul Eggert <eggert@twinsun.com>
parents:
26002
diff
changeset
|
2698 ;; if you need to recompile all the Lisp files using interpreted code. |
51051
b39d8ed2d159
(with-selected-window): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50694
diff
changeset
|
2699 (declare (indent 0) (debug t)) |
26084
804cba424b64
Fix bootstrapping problems.
Paul Eggert <eggert@twinsun.com>
parents:
26002
diff
changeset
|
2700 (list 'let |
804cba424b64
Fix bootstrapping problems.
Paul Eggert <eggert@twinsun.com>
parents:
26002
diff
changeset
|
2701 '((save-match-data-internal (match-data))) |
804cba424b64
Fix bootstrapping problems.
Paul Eggert <eggert@twinsun.com>
parents:
26002
diff
changeset
|
2702 (list 'unwind-protect |
804cba424b64
Fix bootstrapping problems.
Paul Eggert <eggert@twinsun.com>
parents:
26002
diff
changeset
|
2703 (cons 'progn body) |
63664
f29e9a430d73
(save-match-data): Add comment about using evaporate arg
Kim F. Storm <storm@cua.dk>
parents:
63634
diff
changeset
|
2704 ;; It is safe to free (evaporate) markers immediately here, |
f29e9a430d73
(save-match-data): Add comment about using evaporate arg
Kim F. Storm <storm@cua.dk>
parents:
63634
diff
changeset
|
2705 ;; as Lisp programs should not copy from save-match-data-internal. |
63151
cb45242e9d82
(save-match-data): Add RESEAT arg `evaporate' to
Kim F. Storm <storm@cua.dk>
parents:
62861
diff
changeset
|
2706 '(set-match-data save-match-data-internal 'evaporate)))) |
144
535ec1aa78ef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
114
diff
changeset
|
2707 |
11115
9414f249cd8b
Changed match-string to defun, but still return nil (no error) if no match.
Simon Marshall <simon@gnu.org>
parents:
11101
diff
changeset
|
2708 (defun match-string (num &optional string) |
11101
67231dca5f32
Change to macro, and return nil if there was no match at the specified depth.
Simon Marshall <simon@gnu.org>
parents:
11087
diff
changeset
|
2709 "Return string of text matched by last search. |
67231dca5f32
Change to macro, and return nil if there was no match at the specified depth.
Simon Marshall <simon@gnu.org>
parents:
11087
diff
changeset
|
2710 NUM specifies which parenthesized expression in the last regexp. |
67231dca5f32
Change to macro, and return nil if there was no match at the specified depth.
Simon Marshall <simon@gnu.org>
parents:
11087
diff
changeset
|
2711 Value is nil if NUMth pair didn't match, or there were less than NUM pairs. |
67231dca5f32
Change to macro, and return nil if there was no match at the specified depth.
Simon Marshall <simon@gnu.org>
parents:
11087
diff
changeset
|
2712 Zero means the entire text matched by the whole regexp or whole string. |
67231dca5f32
Change to macro, and return nil if there was no match at the specified depth.
Simon Marshall <simon@gnu.org>
parents:
11087
diff
changeset
|
2713 STRING should be given if the last search was by `string-match' on STRING." |
11115
9414f249cd8b
Changed match-string to defun, but still return nil (no error) if no match.
Simon Marshall <simon@gnu.org>
parents:
11101
diff
changeset
|
2714 (if (match-beginning num) |
9414f249cd8b
Changed match-string to defun, but still return nil (no error) if no match.
Simon Marshall <simon@gnu.org>
parents:
11101
diff
changeset
|
2715 (if string |
9414f249cd8b
Changed match-string to defun, but still return nil (no error) if no match.
Simon Marshall <simon@gnu.org>
parents:
11101
diff
changeset
|
2716 (substring string (match-beginning num) (match-end num)) |
9414f249cd8b
Changed match-string to defun, but still return nil (no error) if no match.
Simon Marshall <simon@gnu.org>
parents:
11101
diff
changeset
|
2717 (buffer-substring (match-beginning num) (match-end num))))) |
10560
fd09d51dfd77
(match-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10368
diff
changeset
|
2718 |
20491
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2719 (defun match-string-no-properties (num &optional string) |
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2720 "Return string of text matched by last search, without text properties. |
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2721 NUM specifies which parenthesized expression in the last regexp. |
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2722 Value is nil if NUMth pair didn't match, or there were less than NUM pairs. |
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2723 Zero means the entire text matched by the whole regexp or whole string. |
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2724 STRING should be given if the last search was by `string-match' on STRING." |
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2725 (if (match-beginning num) |
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2726 (if string |
53994
342806d7b32b
(match-string-no-properties): Use substring-no-properties.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53626
diff
changeset
|
2727 (substring-no-properties string (match-beginning num) |
342806d7b32b
(match-string-no-properties): Use substring-no-properties.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53626
diff
changeset
|
2728 (match-end num)) |
20491
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2729 (buffer-substring-no-properties (match-beginning num) |
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2730 (match-end num))))) |
d884af34ba47
(match-string-no-properties): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20476
diff
changeset
|
2731 |
86017
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2732 |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2733 (defun match-substitute-replacement (replacement |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2734 &optional fixedcase literal string subexp) |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2735 "Return REPLACEMENT as it will be inserted by `replace-match'. |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2736 In other words, all back-references in the form `\\&' and `\\N' |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2737 are substituted with actual strings matched by the last search. |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2738 Optional FIXEDCASE, LITERAL, STRING and SUBEXP have the same |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2739 meaning as for `replace-match'." |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2740 (let ((match (match-string 0 string))) |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2741 (save-match-data |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2742 (set-match-data (mapcar (lambda (x) |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2743 (if (numberp x) |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2744 (- x (match-beginning 0)) |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2745 x)) |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2746 (match-data t))) |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2747 (replace-match replacement fixedcase literal match subexp)))) |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2748 |
484f09d924cf
(match-substitute-replacement): New function.
Juri Linkov <juri@jurta.org>
parents:
85688
diff
changeset
|
2749 |
62861
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2750 (defun looking-back (regexp &optional limit greedy) |
51611
d201fdadadce
(looking-back): Handle the case of non-trivial regexps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51339
diff
changeset
|
2751 "Return non-nil if text before point matches regular expression REGEXP. |
57523
a2d6c6e6486a
(looking-back): Return only t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
57480
diff
changeset
|
2752 Like `looking-at' except matches before point, and is slower. |
72096
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
2753 LIMIT if non-nil speeds up the search by specifying a minimum |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
2754 starting position, to avoid checking matches that would start |
74ec3b24ac69
(dolist, dotimes): Use interned symbols for iteration.
Richard M. Stallman <rms@gnu.org>
parents:
71961
diff
changeset
|
2755 before LIMIT. |
62861
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2756 |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2757 If GREEDY is non-nil, extend the match backwards as far as possible, |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2758 stopping when a single additional previous character cannot be part |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2759 of a match for REGEXP." |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2760 (let ((start (point)) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2761 (pos |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2762 (save-excursion |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2763 (and (re-search-backward (concat "\\(?:" regexp "\\)\\=") limit t) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2764 (point))))) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2765 (if (and greedy pos) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2766 (save-restriction |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2767 (narrow-to-region (point-min) start) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2768 (while (and (> pos (point-min)) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2769 (save-excursion |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2770 (goto-char pos) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2771 (backward-char 1) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2772 (looking-at (concat "\\(?:" regexp "\\)\\'")))) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2773 (setq pos (1- pos))) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2774 (save-excursion |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2775 (goto-char pos) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2776 (looking-at (concat "\\(?:" regexp "\\)\\'"))))) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2777 (not (null pos)))) |
0d5825b4e125
(looking-back): New argument GREEDY.
Richard M. Stallman <rms@gnu.org>
parents:
62710
diff
changeset
|
2778 |
81783
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2779 (defsubst looking-at-p (regexp) |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2780 "\ |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2781 Same as `looking-at' except this function does not change the match data." |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2782 (let ((inhibit-changing-match-data t)) |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2783 (looking-at regexp))) |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2784 |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2785 (defsubst string-match-p (regexp string &optional start) |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2786 "\ |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2787 Same as `string-match' except this function does not change the match data." |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2788 (let ((inhibit-changing-match-data t)) |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2789 (string-match regexp string start))) |
f1d802f34413
(looking-at-p, string-match-p): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
81765
diff
changeset
|
2790 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2791 (defun subregexp-context-p (regexp pos &optional start) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2792 "Return non-nil if POS is in a normal subregexp context in REGEXP. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2793 A subregexp context is one where a sub-regexp can appear. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2794 A non-subregexp context is for example within brackets, or within a |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2795 repetition bounds operator `\\=\\{...\\}', or right after a `\\'. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2796 If START is non-nil, it should be a position in REGEXP, smaller |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2797 than POS, and known to be in a subregexp context." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2798 ;; Here's one possible implementation, with the great benefit that it |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2799 ;; reuses the regexp-matcher's own parser, so it understands all the |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2800 ;; details of the syntax. A disadvantage is that it needs to match the |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2801 ;; error string. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2802 (condition-case err |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2803 (progn |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2804 (string-match (substring regexp (or start 0) pos) "") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2805 t) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2806 (invalid-regexp |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2807 (not (member (cadr err) '("Unmatched [ or [^" |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2808 "Unmatched \\{" |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2809 "Trailing backslash"))))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2810 ;; An alternative implementation: |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2811 ;; (defconst re-context-re |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2812 ;; (let* ((harmless-ch "[^\\[]") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2813 ;; (harmless-esc "\\\\[^{]") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2814 ;; (class-harmless-ch "[^][]") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2815 ;; (class-lb-harmless "[^]:]") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2816 ;; (class-lb-colon-maybe-charclass ":\\([a-z]+:]\\)?") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2817 ;; (class-lb (concat "\\[\\(" class-lb-harmless |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2818 ;; "\\|" class-lb-colon-maybe-charclass "\\)")) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2819 ;; (class |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2820 ;; (concat "\\[^?]?" |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2821 ;; "\\(" class-harmless-ch |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2822 ;; "\\|" class-lb "\\)*" |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2823 ;; "\\[?]")) ; special handling for bare [ at end of re |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2824 ;; (braces "\\\\{[0-9,]+\\\\}")) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2825 ;; (concat "\\`\\(" harmless-ch "\\|" harmless-esc |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2826 ;; "\\|" class "\\|" braces "\\)*\\'")) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2827 ;; "Matches any prefix that corresponds to a normal subregexp context.") |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2828 ;; (string-match re-context-re (substring regexp (or start 0) pos)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2829 ) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2830 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2831 ;;;; split-string |
51339
14976a545668
(looking-back): New function to check for regular expression before point.
Juanma Barranquero <lekktu@gmail.com>
parents:
51148
diff
changeset
|
2832 |
51148
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2833 (defconst split-string-default-separators "[ \f\t\n\r\v]+" |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2834 "The default value of separators for `split-string'. |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2835 |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2836 A regexp matching strings of whitespace. May be locale-dependent |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2837 \(as yet unimplemented). Should not match non-breaking spaces. |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2838 |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2839 Warning: binding this to a different value and using it as default is |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2840 likely to have undesired semantics.") |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2841 |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2842 ;; The specification says that if both SEPARATORS and OMIT-NULLS are |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2843 ;; defaulted, OMIT-NULLS should be treated as t. Simplifying the logical |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2844 ;; expression leads to the equivalent implementation that if SEPARATORS |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2845 ;; is defaulted, OMIT-NULLS is treated as t. |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2846 (defun split-string (string &optional separators omit-nulls) |
57006
a806a6bbc178
(split-string): Docfix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56826
diff
changeset
|
2847 "Split STRING into substrings bounded by matches for SEPARATORS. |
51148
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2848 |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2849 The beginning and end of STRING, and each match for SEPARATORS, are |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2850 splitting points. The substrings matching SEPARATORS are removed, and |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2851 the substrings between the splitting points are collected as a list, |
16314
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2852 which is returned. |
51148
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2853 |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2854 If SEPARATORS is non-nil, it should be a regular expression matching text |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2855 which separates, but is not part of, the substrings. If nil it defaults to |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2856 `split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2857 OMIT-NULLS is forced to t. |
20476
f213a5906ea6
(split-string): Handle empty matches reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
20472
diff
changeset
|
2858 |
55406
3b27c2f86c7a
(lambda): Add arglist description to docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55232
diff
changeset
|
2859 If OMIT-NULLS is t, zero-length substrings are omitted from the list \(so |
51148
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2860 that for the default value of SEPARATORS leading and trailing whitespace |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2861 are effectively trimmed). If nil, all zero-length substrings are retained, |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2862 which correctly parses CSV format, for example. |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2863 |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2864 Note that the effect of `(split-string STRING)' is the same as |
75124
f4fe3d3016b1
(split-string): Remove spurious ")" from doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
75106
diff
changeset
|
2865 `(split-string STRING split-string-default-separators t)'. In the rare |
51148
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2866 case that you wish to retain zero-length substrings when splitting on |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2867 whitespace, use `(split-string STRING split-string-default-separators)'. |
27810
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2868 |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2869 Modifies the match data; use `save-match-data' if necessary." |
51148
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2870 (let ((keep-nulls (not (if separators omit-nulls t))) |
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2871 (rexp (or separators split-string-default-separators)) |
16314
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2872 (start 0) |
20476
f213a5906ea6
(split-string): Handle empty matches reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
20472
diff
changeset
|
2873 notfirst |
16314
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2874 (list nil)) |
20476
f213a5906ea6
(split-string): Handle empty matches reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
20472
diff
changeset
|
2875 (while (and (string-match rexp string |
f213a5906ea6
(split-string): Handle empty matches reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
20472
diff
changeset
|
2876 (if (and notfirst |
f213a5906ea6
(split-string): Handle empty matches reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
20472
diff
changeset
|
2877 (= start (match-beginning 0)) |
f213a5906ea6
(split-string): Handle empty matches reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
20472
diff
changeset
|
2878 (< start (length string))) |
f213a5906ea6
(split-string): Handle empty matches reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
20472
diff
changeset
|
2879 (1+ start) start)) |
51148
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2880 (< start (length string))) |
20476
f213a5906ea6
(split-string): Handle empty matches reasonably.
Richard M. Stallman <rms@gnu.org>
parents:
20472
diff
changeset
|
2881 (setq notfirst t) |
51148
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2882 (if (or keep-nulls (< start (match-beginning 0))) |
16314
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2883 (setq list |
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2884 (cons (substring string start (match-beginning 0)) |
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2885 list))) |
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2886 (setq start (match-end 0))) |
51148
f59aeee43725
(split-string): Implement specification that splitting on explicit separators
Juanma Barranquero <lekktu@gmail.com>
parents:
51068
diff
changeset
|
2887 (if (or keep-nulls (< start (length string))) |
16314
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2888 (setq list |
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2889 (cons (substring string start) |
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2890 list))) |
c72b7ee606a3
(split-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16311
diff
changeset
|
2891 (nreverse list))) |
78081
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2892 |
78530
1532be3afc8a
(combine-and-quote-strings): Renamed from strings->string.
Richard M. Stallman <rms@gnu.org>
parents:
78236
diff
changeset
|
2893 (defun combine-and-quote-strings (strings &optional separator) |
78081
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2894 "Concatenate the STRINGS, adding the SEPARATOR (default \" \"). |
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2895 This tries to quote the strings to avoid ambiguity such that |
78530
1532be3afc8a
(combine-and-quote-strings): Renamed from strings->string.
Richard M. Stallman <rms@gnu.org>
parents:
78236
diff
changeset
|
2896 (split-string-and-unquote (combine-and-quote-strings strs)) == strs |
78081
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2897 Only some SEPARATORs will work properly." |
93825
f0bcbdcf1d54
(combine-and-quote-strings): Also quote strings that contain the separator.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93735
diff
changeset
|
2898 (let* ((sep (or separator " ")) |
f0bcbdcf1d54
(combine-and-quote-strings): Also quote strings that contain the separator.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93735
diff
changeset
|
2899 (re (concat "[\\\"]" "\\|" (regexp-quote sep)))) |
78081
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2900 (mapconcat |
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2901 (lambda (str) |
93825
f0bcbdcf1d54
(combine-and-quote-strings): Also quote strings that contain the separator.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93735
diff
changeset
|
2902 (if (string-match re str) |
78081
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2903 (concat "\"" (replace-regexp-in-string "[\\\"]" "\\\\\\&" str) "\"") |
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2904 str)) |
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2905 strings sep))) |
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2906 |
78530
1532be3afc8a
(combine-and-quote-strings): Renamed from strings->string.
Richard M. Stallman <rms@gnu.org>
parents:
78236
diff
changeset
|
2907 (defun split-string-and-unquote (string &optional separator) |
78081
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2908 "Split the STRING into a list of strings. |
78530
1532be3afc8a
(combine-and-quote-strings): Renamed from strings->string.
Richard M. Stallman <rms@gnu.org>
parents:
78236
diff
changeset
|
2909 It understands Emacs Lisp quoting within STRING, such that |
1532be3afc8a
(combine-and-quote-strings): Renamed from strings->string.
Richard M. Stallman <rms@gnu.org>
parents:
78236
diff
changeset
|
2910 (split-string-and-unquote (combine-and-quote-strings strs)) == strs |
78081
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2911 The SEPARATOR regexp defaults to \"\\s-+\"." |
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2912 (let ((sep (or separator "\\s-+")) |
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2913 (i (string-match "[\"]" string))) |
78530
1532be3afc8a
(combine-and-quote-strings): Renamed from strings->string.
Richard M. Stallman <rms@gnu.org>
parents:
78236
diff
changeset
|
2914 (if (null i) |
1532be3afc8a
(combine-and-quote-strings): Renamed from strings->string.
Richard M. Stallman <rms@gnu.org>
parents:
78236
diff
changeset
|
2915 (split-string string sep t) ; no quoting: easy |
78081
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2916 (append (unless (eq i 0) (split-string (substring string 0 i) sep t)) |
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2917 (let ((rfs (read-from-string string i))) |
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2918 (cons (car rfs) |
78530
1532be3afc8a
(combine-and-quote-strings): Renamed from strings->string.
Richard M. Stallman <rms@gnu.org>
parents:
78236
diff
changeset
|
2919 (split-string-and-unquote (substring string (cdr rfs)) |
1532be3afc8a
(combine-and-quote-strings): Renamed from strings->string.
Richard M. Stallman <rms@gnu.org>
parents:
78236
diff
changeset
|
2920 sep))))))) |
78081
d53cb34bfd32
* pcvs-util.el (cvs-strings->string, cvs-string->strings):
Nick Roberts <nickrob@snap.net.nz>
parents:
77423
diff
changeset
|
2921 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2922 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2923 ;;;; Replacement in strings. |
24089
70954a8be49b
(subst-char-in-string): New function.
Andrew Innes <andrewi@gnu.org>
parents:
24011
diff
changeset
|
2924 |
70954a8be49b
(subst-char-in-string): New function.
Andrew Innes <andrewi@gnu.org>
parents:
24011
diff
changeset
|
2925 (defun subst-char-in-string (fromchar tochar string &optional inplace) |
70954a8be49b
(subst-char-in-string): New function.
Andrew Innes <andrewi@gnu.org>
parents:
24011
diff
changeset
|
2926 "Replace FROMCHAR with TOCHAR in STRING each time it occurs. |
70954a8be49b
(subst-char-in-string): New function.
Andrew Innes <andrewi@gnu.org>
parents:
24011
diff
changeset
|
2927 Unless optional argument INPLACE is non-nil, return a new string." |
33835
1b1555d26963
Undoing the changes erroneously committed just before.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33833
diff
changeset
|
2928 (let ((i (length string)) |
1b1555d26963
Undoing the changes erroneously committed just before.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33833
diff
changeset
|
2929 (newstr (if inplace string (copy-sequence string)))) |
1b1555d26963
Undoing the changes erroneously committed just before.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33833
diff
changeset
|
2930 (while (> i 0) |
1b1555d26963
Undoing the changes erroneously committed just before.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33833
diff
changeset
|
2931 (setq i (1- i)) |
1b1555d26963
Undoing the changes erroneously committed just before.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33833
diff
changeset
|
2932 (if (eq (aref newstr i) fromchar) |
1b1555d26963
Undoing the changes erroneously committed just before.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33833
diff
changeset
|
2933 (aset newstr i tochar))) |
1b1555d26963
Undoing the changes erroneously committed just before.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33833
diff
changeset
|
2934 newstr)) |
27810
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2935 |
28148
0f14966fe791
(replace-regexp-in-string): Renamed from
Dave Love <fx@gnu.org>
parents:
28065
diff
changeset
|
2936 (defun replace-regexp-in-string (regexp rep string &optional |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
2937 fixedcase literal subexp start) |
27810
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2938 "Replace all matches for REGEXP with REP in STRING. |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2939 |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2940 Return a new string containing the replacements. |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2941 |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2942 Optional arguments FIXEDCASE, LITERAL and SUBEXP are like the |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2943 arguments with the same names of function `replace-match'. If START |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2944 is non-nil, start replacements at that index in STRING. |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2945 |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2946 REP is either a string used as the NEWTEXT arg of `replace-match' or a |
65058
de7df04c6d6b
(replace-regexp-in-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
65014
diff
changeset
|
2947 function. If it is a function, it is called with the actual text of each |
de7df04c6d6b
(replace-regexp-in-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
65014
diff
changeset
|
2948 match, and its value is used as the replacement text. When REP is called, |
de7df04c6d6b
(replace-regexp-in-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
65014
diff
changeset
|
2949 the match-data are the result of matching REGEXP against a substring |
de7df04c6d6b
(replace-regexp-in-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
65014
diff
changeset
|
2950 of STRING. |
27810
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2951 |
28148
0f14966fe791
(replace-regexp-in-string): Renamed from
Dave Love <fx@gnu.org>
parents:
28065
diff
changeset
|
2952 To replace only the first match (if any), make REGEXP match up to \\' |
0f14966fe791
(replace-regexp-in-string): Renamed from
Dave Love <fx@gnu.org>
parents:
28065
diff
changeset
|
2953 and replace a sub-expression, e.g. |
48077
69077a78e52f
(replace-regexp-in-string): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
47916
diff
changeset
|
2954 (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\'\" \"bar\" \" foo foo\" nil nil 1) |
28148
0f14966fe791
(replace-regexp-in-string): Renamed from
Dave Love <fx@gnu.org>
parents:
28065
diff
changeset
|
2955 => \" bar foo\" |
0f14966fe791
(replace-regexp-in-string): Renamed from
Dave Love <fx@gnu.org>
parents:
28065
diff
changeset
|
2956 " |
27810
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2957 |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2958 ;; To avoid excessive consing from multiple matches in long strings, |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2959 ;; don't just call `replace-match' continually. Walk down the |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2960 ;; string looking for matches of REGEXP and building up a (reversed) |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2961 ;; list MATCHES. This comprises segments of STRING which weren't |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2962 ;; matched interspersed with replacements for segments that were. |
39557
fb85410efef7
(define-key-after): Allow `key' to be longer than 1.
Gerd Moellmann <gerd@gnu.org>
parents:
38760
diff
changeset
|
2963 ;; [For a `large' number of replacements it's more efficient to |
27810
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2964 ;; operate in a temporary buffer; we can't tell from the function's |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2965 ;; args whether to choose the buffer-based implementation, though it |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2966 ;; might be reasonable to do so for long enough STRING.] |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2967 (let ((l (length string)) |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2968 (start (or start 0)) |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2969 matches str mb me) |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2970 (save-match-data |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2971 (while (and (< start l) (string-match regexp string start)) |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2972 (setq mb (match-beginning 0) |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2973 me (match-end 0)) |
28065
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2974 ;; If we matched the empty string, make sure we advance by one char |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2975 (when (= me mb) (setq me (min l (1+ mb)))) |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2976 ;; Generate a replacement for the matched substring. |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2977 ;; Operate only on the substring to minimize string consing. |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2978 ;; Set up match data for the substring for replacement; |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2979 ;; presumably this is likely to be faster than munging the |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2980 ;; match data directly in Lisp. |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2981 (string-match regexp (setq str (substring string mb me))) |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2982 (setq matches |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2983 (cons (replace-match (if (stringp rep) |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2984 rep |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2985 (funcall rep (match-string 0 str))) |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2986 fixedcase literal str subexp) |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
2987 (cons (substring string start mb) ; unmatched prefix |
28065
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2988 matches))) |
093dcd5f39b2
(replace-regexps-in-string): Properly handle the case where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27908
diff
changeset
|
2989 (setq start me)) |
27810
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2990 ;; Reconstruct a string from the pieces. |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2991 (setq matches (cons (substring string start l) matches)) ; leftover |
1d7650c95e0a
(when, unless, split-string): Doc fix.
Dave Love <fx@gnu.org>
parents:
27482
diff
changeset
|
2992 (apply #'concat (nreverse matches))))) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2993 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2994 ;;;; invisibility specs |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2995 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2996 (defun add-to-invisibility-spec (element) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2997 "Add ELEMENT to `buffer-invisibility-spec'. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2998 See documentation for `buffer-invisibility-spec' for the kind of elements |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
2999 that can be added." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3000 (if (eq buffer-invisibility-spec t) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3001 (setq buffer-invisibility-spec (list t))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3002 (setq buffer-invisibility-spec |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3003 (cons element buffer-invisibility-spec))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3004 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3005 (defun remove-from-invisibility-spec (element) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3006 "Remove ELEMENT from `buffer-invisibility-spec'." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3007 (if (consp buffer-invisibility-spec) |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
3008 (setq buffer-invisibility-spec |
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
3009 (delete element buffer-invisibility-spec)))) |
16359
18cc78dc8b18
(with-temp-file): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16333
diff
changeset
|
3010 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3011 ;;;; Syntax tables. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3012 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3013 (defmacro with-syntax-table (table &rest body) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3014 "Evaluate BODY with syntax table of current buffer set to TABLE. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3015 The syntax table of the current buffer is saved, BODY is evaluated, and the |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3016 saved table is restored, even in case of an abnormal exit. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3017 Value is what BODY returns." |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3018 (declare (debug t)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3019 (let ((old-table (make-symbol "table")) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3020 (old-buffer (make-symbol "buffer"))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3021 `(let ((,old-table (syntax-table)) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3022 (,old-buffer (current-buffer))) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3023 (unwind-protect |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3024 (progn |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3025 (set-syntax-table ,table) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3026 ,@body) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3027 (save-current-buffer |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3028 (set-buffer ,old-buffer) |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3029 (set-syntax-table ,old-table)))))) |
5385
53077bf7c718
(shell-quote-argument): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5302
diff
changeset
|
3030 |
5844
445de172c217
(make-syntax-table): Behave like copy-syntax-table if an argument is given,
Karl Heuer <kwzh@gnu.org>
parents:
5460
diff
changeset
|
3031 (defun make-syntax-table (&optional oldtable) |
5421
a248a39fa4b8
(make-syntax-table): New function; no longer an alias
Richard M. Stallman <rms@gnu.org>
parents:
5385
diff
changeset
|
3032 "Return a new syntax table. |
40822
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
3033 Create a syntax table which inherits from OLDTABLE (if non-nil) or |
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
3034 from `standard-syntax-table' otherwise." |
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
3035 (let ((table (make-char-table 'syntax-table nil))) |
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
3036 (set-char-table-parent table (or oldtable (standard-syntax-table))) |
b10e7d6fb95b
(with-local-quit): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40282
diff
changeset
|
3037 table)) |
17146
b8536e42d4ef
(combine-after-change-calls): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
16845
diff
changeset
|
3038 |
47355
9e3ee43b5262
(symbol-file): Also work for autoloaded funcs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47305
diff
changeset
|
3039 (defun syntax-after (pos) |
61798 | 3040 "Return the raw syntax of the char after POS. |
3041 If POS is outside the buffer's accessible portion, return nil." | |
47355
9e3ee43b5262
(symbol-file): Also work for autoloaded funcs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47305
diff
changeset
|
3042 (unless (or (< pos (point-min)) (>= pos (point-max))) |
58416
28906724d6e3
(syntax-after): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58272
diff
changeset
|
3043 (let ((st (if parse-sexp-lookup-properties |
28906724d6e3
(syntax-after): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58272
diff
changeset
|
3044 (get-char-property pos 'syntax-table)))) |
28906724d6e3
(syntax-after): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58272
diff
changeset
|
3045 (if (consp st) st |
28906724d6e3
(syntax-after): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58272
diff
changeset
|
3046 (aref (or st (syntax-table)) (char-after pos)))))) |
47355
9e3ee43b5262
(symbol-file): Also work for autoloaded funcs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47305
diff
changeset
|
3047 |
61669
c95f35bea727
(syntax-class): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60764
diff
changeset
|
3048 (defun syntax-class (syntax) |
61798 | 3049 "Return the syntax class part of the syntax descriptor SYNTAX. |
3050 If SYNTAX is nil, return nil." | |
3051 (and syntax (logand (car syntax) 65535))) | |
10825
4dba26c66bf5
(global_set_key, local_set_key, global_unset_key)
Richard M. Stallman <rms@gnu.org>
parents:
10794
diff
changeset
|
3052 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3053 ;;;; Text clones |
40282
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3054 |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3055 (defun text-clone-maintain (ol1 after beg end &optional len) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3056 "Propagate the changes made under the overlay OL1 to the other clones. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3057 This is used on the `modification-hooks' property of text clones." |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3058 (when (and after (not undo-in-progress) (overlay-start ol1)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3059 (let ((margin (if (overlay-get ol1 'text-clone-spreadp) 1 0))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3060 (setq beg (max beg (+ (overlay-start ol1) margin))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3061 (setq end (min end (- (overlay-end ol1) margin))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3062 (when (<= beg end) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3063 (save-excursion |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3064 (when (overlay-get ol1 'text-clone-syntax) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3065 ;; Check content of the clone's text. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3066 (let ((cbeg (+ (overlay-start ol1) margin)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3067 (cend (- (overlay-end ol1) margin))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3068 (goto-char cbeg) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3069 (save-match-data |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3070 (if (not (re-search-forward |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3071 (overlay-get ol1 'text-clone-syntax) cend t)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3072 ;; Mark the overlay for deletion. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3073 (overlay-put ol1 'text-clones nil) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3074 (when (< (match-end 0) cend) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3075 ;; Shrink the clone at its end. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3076 (setq end (min end (match-end 0))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3077 (move-overlay ol1 (overlay-start ol1) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3078 (+ (match-end 0) margin))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3079 (when (> (match-beginning 0) cbeg) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3080 ;; Shrink the clone at its beginning. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3081 (setq beg (max (match-beginning 0) beg)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3082 (move-overlay ol1 (- (match-beginning 0) margin) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3083 (overlay-end ol1))))))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3084 ;; Now go ahead and update the clones. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3085 (let ((head (- beg (overlay-start ol1))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3086 (tail (- (overlay-end ol1) end)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3087 (str (buffer-substring beg end)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3088 (nothing-left t) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3089 (inhibit-modification-hooks t)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3090 (dolist (ol2 (overlay-get ol1 'text-clones)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3091 (let ((oe (overlay-end ol2))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3092 (unless (or (eq ol1 ol2) (null oe)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3093 (setq nothing-left nil) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3094 (let ((mod-beg (+ (overlay-start ol2) head))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3095 ;;(overlay-put ol2 'modification-hooks nil) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3096 (goto-char (- (overlay-end ol2) tail)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3097 (unless (> mod-beg (point)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3098 (save-excursion (insert str)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3099 (delete-region mod-beg (point))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3100 ;;(overlay-put ol2 'modification-hooks '(text-clone-maintain)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3101 )))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3102 (if nothing-left (delete-overlay ol1)))))))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3103 |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3104 (defun text-clone-create (start end &optional spreadp syntax) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3105 "Create a text clone of START...END at point. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3106 Text clones are chunks of text that are automatically kept identical: |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3107 changes done to one of the clones will be immediately propagated to the other. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3108 |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3109 The buffer's content at point is assumed to be already identical to |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3110 the one between START and END. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3111 If SYNTAX is provided it's a regexp that describes the possible text of |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3112 the clones; the clone will be shrunk or killed if necessary to ensure that |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3113 its text matches the regexp. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3114 If SPREADP is non-nil it indicates that text inserted before/after the |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3115 clone should be incorporated in the clone." |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3116 ;; To deal with SPREADP we can either use an overlay with `nil t' along |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3117 ;; with insert-(behind|in-front-of)-hooks or use a slightly larger overlay |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3118 ;; (with a one-char margin at each end) with `t nil'. |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3119 ;; We opted for a larger overlay because it behaves better in the case |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3120 ;; where the clone is reduced to the empty string (we want the overlay to |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3121 ;; stay when the clone's content is the empty string and we want to use |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3122 ;; `evaporate' to make sure those overlays get deleted when needed). |
47916 | 3123 ;; |
40282
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3124 (let* ((pt-end (+ (point) (- end start))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3125 (start-margin (if (or (not spreadp) (bobp) (<= start (point-min))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3126 0 1)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3127 (end-margin (if (or (not spreadp) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3128 (>= pt-end (point-max)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3129 (>= start (point-max))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3130 0 1)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3131 (ol1 (make-overlay (- start start-margin) (+ end end-margin) nil t)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3132 (ol2 (make-overlay (- (point) start-margin) (+ pt-end end-margin) nil t)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3133 (dups (list ol1 ol2))) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3134 (overlay-put ol1 'modification-hooks '(text-clone-maintain)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3135 (when spreadp (overlay-put ol1 'text-clone-spreadp t)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3136 (when syntax (overlay-put ol1 'text-clone-syntax syntax)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3137 ;;(overlay-put ol1 'face 'underline) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3138 (overlay-put ol1 'evaporate t) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3139 (overlay-put ol1 'text-clones dups) |
47916 | 3140 ;; |
40282
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3141 (overlay-put ol2 'modification-hooks '(text-clone-maintain)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3142 (when spreadp (overlay-put ol2 'text-clone-spreadp t)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3143 (when syntax (overlay-put ol2 'text-clone-syntax syntax)) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3144 ;;(overlay-put ol2 'face 'underline) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3145 (overlay-put ol2 'evaporate t) |
7f05eff77ea2
(delay-mode-hooks, delayed-mode-hooks, run-mode-hooks): New vars and functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39725
diff
changeset
|
3146 (overlay-put ol2 'text-clones dups))) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3147 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3148 ;;;; Mail user agents. |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3149 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3150 ;; Here we include just enough for other packages to be able |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3151 ;; to define them. |
44422
5f7f8b191a8c
(play-sound): Move here from simple.el.
Pavel Janík <Pavel@Janik.cz>
parents:
44285
diff
changeset
|
3152 |
47406
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3153 (defun define-mail-user-agent (symbol composefunc sendfunc |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3154 &optional abortfunc hookvar) |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3155 "Define a symbol to identify a mail-sending package for `mail-user-agent'. |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3156 |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3157 SYMBOL can be any Lisp symbol. Its function definition and/or |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3158 value as a variable do not matter for this usage; we use only certain |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3159 properties on its property list, to encode the rest of the arguments. |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3160 |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3161 COMPOSEFUNC is program callable function that composes an outgoing |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3162 mail message buffer. This function should set up the basics of the |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3163 buffer without requiring user interaction. It should populate the |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3164 standard mail headers, leaving the `to:' and `subject:' headers blank |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3165 by default. |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3166 |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3167 COMPOSEFUNC should accept several optional arguments--the same |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3168 arguments that `compose-mail' takes. See that function's documentation. |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3169 |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3170 SENDFUNC is the command a user would run to send the message. |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3171 |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3172 Optional ABORTFUNC is the command a user would run to abort the |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3173 message. For mail packages that don't have a separate abort function, |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3174 this can be `kill-buffer' (the equivalent of omitting this argument). |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3175 |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3176 Optional HOOKVAR is a hook variable that gets run before the message |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3177 is actually sent. Callers that use the `mail-user-agent' may |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3178 install a hook function temporarily on this hook variable. |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3179 If HOOKVAR is nil, `mail-send-hook' is used. |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3180 |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3181 The properties used on SYMBOL are `composefunc', `sendfunc', |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3182 `abortfunc', and `hookvar'." |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3183 (put symbol 'composefunc composefunc) |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3184 (put symbol 'sendfunc sendfunc) |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3185 (put symbol 'abortfunc (or abortfunc 'kill-buffer)) |
fbd7a9a8682c
(define-mail-user-agent): Moved from simple.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47355
diff
changeset
|
3186 (put symbol 'hookvar (or hookvar 'mail-send-hook))) |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3187 |
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3188 ;;;; Progress reporters. |
57384
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3189 |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3190 ;; Progress reporter has the following structure: |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3191 ;; |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3192 ;; (NEXT-UPDATE-VALUE . [NEXT-UPDATE-TIME |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3193 ;; MIN-VALUE |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3194 ;; MAX-VALUE |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3195 ;; MESSAGE |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3196 ;; MIN-CHANGE |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3197 ;; MIN-TIME]) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3198 ;; |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3199 ;; This weirdeness is for optimization reasons: we want |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3200 ;; `progress-reporter-update' to be as fast as possible, so |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3201 ;; `(car reporter)' is better than `(aref reporter 0)'. |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3202 ;; |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3203 ;; NEXT-UPDATE-TIME is a float. While `float-time' loses a couple |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3204 ;; digits of precision, it doesn't really matter here. On the other |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3205 ;; hand, it greatly simplifies the code. |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3206 |
57408
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3207 (defsubst progress-reporter-update (reporter value) |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3208 "Report progress of an operation in the echo area. |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3209 However, if the change since last echo area update is too small |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3210 or not enough time has passed, then do nothing (see |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3211 `make-progress-reporter' for details). |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3212 |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3213 First parameter, REPORTER, should be the result of a call to |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3214 `make-progress-reporter'. Second, VALUE, determines the actual |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3215 progress of operation; it must be between MIN-VALUE and MAX-VALUE |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3216 as passed to `make-progress-reporter'. |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3217 |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3218 This function is very inexpensive, you may not bother how often |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3219 you call it." |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3220 (when (>= value (car reporter)) |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3221 (progress-reporter-do-update reporter value))) |
601c087f45f6
(progress-reporter-update): Define before first usage.
Kim F. Storm <storm@cua.dk>
parents:
57384
diff
changeset
|
3222 |
57384
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3223 (defun make-progress-reporter (message min-value max-value |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3224 &optional current-value |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3225 min-change min-time) |
59648
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3226 "Return progress reporter object to be used with `progress-reporter-update'. |
57384
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3227 |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3228 MESSAGE is shown in the echo area. When at least 1% of operation |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3229 is complete, the exact percentage will be appended to the |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3230 MESSAGE. When you call `progress-reporter-done', word \"done\" |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3231 is printed after the MESSAGE. You can change MESSAGE of an |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3232 existing progress reporter with `progress-reporter-force-update'. |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3233 |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3234 MIN-VALUE and MAX-VALUE designate starting (0% complete) and |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3235 final (100% complete) states of operation. The latter should be |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3236 larger; if this is not the case, then simply negate all values. |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3237 Optional CURRENT-VALUE specifies the progress by the moment you |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3238 call this function. You should omit it or set it to nil in most |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3239 cases since it defaults to MIN-VALUE. |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3240 |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3241 Optional MIN-CHANGE determines the minimal change in percents to |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3242 report (default is 1%.) Optional MIN-TIME specifies the minimal |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3243 time before echo area updates (default is 0.2 seconds.) If |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3244 `float-time' function is not present, then time is not tracked |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3245 at all. If OS is not capable of measuring fractions of seconds, |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3246 then this parameter is effectively rounded up." |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3247 |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3248 (unless min-time |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3249 (setq min-time 0.2)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3250 (let ((reporter |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3251 (cons min-value ;; Force a call to `message' now |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3252 (vector (if (and (fboundp 'float-time) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3253 (>= min-time 0.02)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3254 (float-time) nil) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3255 min-value |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3256 max-value |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3257 message |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3258 (if min-change (max (min min-change 50) 1) 1) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3259 min-time)))) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3260 (progress-reporter-update reporter (or current-value min-value)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3261 reporter)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3262 |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3263 (defun progress-reporter-force-update (reporter value &optional new-message) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3264 "Report progress of an operation in the echo area unconditionally. |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3265 |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3266 First two parameters are the same as for |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3267 `progress-reporter-update'. Optional NEW-MESSAGE allows you to |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3268 change the displayed message." |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3269 (let ((parameters (cdr reporter))) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3270 (when new-message |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3271 (aset parameters 3 new-message)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3272 (when (aref parameters 0) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3273 (aset parameters 0 (float-time))) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3274 (progress-reporter-do-update reporter value))) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3275 |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3276 (defun progress-reporter-do-update (reporter value) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3277 (let* ((parameters (cdr reporter)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3278 (min-value (aref parameters 1)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3279 (max-value (aref parameters 2)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3280 (one-percent (/ (- max-value min-value) 100.0)) |
60764
7fd2729eec90
(progress-reporter-do-update): When `min-value' is equal
Juri Linkov <juri@jurta.org>
parents:
60646
diff
changeset
|
3281 (percentage (if (= max-value min-value) |
7fd2729eec90
(progress-reporter-do-update): When `min-value' is equal
Juri Linkov <juri@jurta.org>
parents:
60646
diff
changeset
|
3282 0 |
7fd2729eec90
(progress-reporter-do-update): When `min-value' is equal
Juri Linkov <juri@jurta.org>
parents:
60646
diff
changeset
|
3283 (truncate (/ (- value min-value) one-percent)))) |
57384
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3284 (update-time (aref parameters 0)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3285 (current-time (float-time)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3286 (enough-time-passed |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3287 ;; See if enough time has passed since the last update. |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3288 (or (not update-time) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3289 (when (>= current-time update-time) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3290 ;; Calculate time for the next update |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3291 (aset parameters 0 (+ update-time (aref parameters 5))))))) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3292 ;; |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3293 ;; Calculate NEXT-UPDATE-VALUE. If we are not going to print |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3294 ;; message this time because not enough time has passed, then use |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3295 ;; 1 instead of MIN-CHANGE. This makes delays between echo area |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3296 ;; updates closer to MIN-TIME. |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3297 (setcar reporter |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3298 (min (+ min-value (* (+ percentage |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3299 (if enough-time-passed |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3300 (aref parameters 4) ;; MIN-CHANGE |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3301 1)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3302 one-percent)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3303 max-value)) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3304 (when (integerp value) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3305 (setcar reporter (ceiling (car reporter)))) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3306 ;; |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3307 ;; Only print message if enough time has passed |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3308 (when enough-time-passed |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3309 (if (> percentage 0) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3310 (message "%s%d%%" (aref parameters 3) percentage) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3311 (message "%s" (aref parameters 3)))))) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3312 |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3313 (defun progress-reporter-done (reporter) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3314 "Print reporter's message followed by word \"done\" in echo area." |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3315 (message "%sdone" (aref (cdr reporter) 3))) |
78290fa43da5
(make-progress-reporter, progress-reporter-update)
Eli Zaretskii <eliz@gnu.org>
parents:
57215
diff
changeset
|
3316 |
59648
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3317 (defmacro dotimes-with-progress-reporter (spec message &rest body) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3318 "Loop a certain number of times and report progress in the echo area. |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3319 Evaluate BODY with VAR bound to successive integers running from |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3320 0, inclusive, to COUNT, exclusive. Then evaluate RESULT to get |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3321 the return value (nil if RESULT is omitted). |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3322 |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3323 At each iteration MESSAGE followed by progress percentage is |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3324 printed in the echo area. After the loop is finished, MESSAGE |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3325 followed by word \"done\" is printed. This macro is a |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3326 convenience wrapper around `make-progress-reporter' and friends. |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3327 |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3328 \(fn (VAR COUNT [RESULT]) MESSAGE BODY...)" |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3329 (declare (indent 2) (debug ((symbolp form &optional form) form body))) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3330 (let ((temp (make-symbol "--dotimes-temp--")) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3331 (temp2 (make-symbol "--dotimes-temp2--")) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3332 (start 0) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3333 (end (nth 1 spec))) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3334 `(let ((,temp ,end) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3335 (,(car spec) ,start) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3336 (,temp2 (make-progress-reporter ,message ,start ,end))) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3337 (while (< ,(car spec) ,temp) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3338 ,@body |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3339 (progress-reporter-update ,temp2 |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3340 (setq ,(car spec) (1+ ,(car spec))))) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3341 (progress-reporter-done ,temp2) |
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3342 nil ,@(cdr (cdr spec))))) |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3343 |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3344 |
66304
f754be327a7e
Much rearrangement of functions and division into pages. No code changes.
Richard M. Stallman <rms@gnu.org>
parents:
66286
diff
changeset
|
3345 ;;;; Comparing version strings. |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3346 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3347 (defvar version-separator "." |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3348 "*Specify the string used to separate the version elements. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3349 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3350 Usually the separator is \".\", but it can be any other string.") |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3351 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3352 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3353 (defvar version-regexp-alist |
67541
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3354 '(("^[-_+ ]?a\\(lpha\\)?$" . -3) |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
3355 ("^[-_+]$" . -3) ; treat "1.2.3-20050920" and "1.2-3" as alpha releases |
73028
66a5ba8082a9
Adjust comment
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
72817
diff
changeset
|
3356 ("^[-_+ ]cvs$" . -3) ; treat "1.2.3-CVS" as alpha release |
67541
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3357 ("^[-_+ ]?b\\(eta\\)?$" . -2) |
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3358 ("^[-_+ ]?\\(pre\\|rc\\)$" . -1)) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3359 "*Specify association between non-numeric version part and a priority. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3360 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3361 This association is used to handle version string like \"1.0pre2\", |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3362 \"0.9alpha1\", etc. It's used by `version-to-list' (which see) to convert the |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3363 non-numeric part to an integer. For example: |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3364 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3365 String Version Integer List Version |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3366 \"1.0pre2\" (1 0 -1 2) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3367 \"1.0PRE2\" (1 0 -1 2) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3368 \"22.8beta3\" (22 8 -2 3) |
67541
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3369 \"22.8 Beta3\" (22 8 -2 3) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3370 \"0.9alpha1\" (0 9 -3 1) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3371 \"0.9AlphA1\" (0 9 -3 1) |
67541
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3372 \"0.9 alpha\" (0 9 -3) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3373 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3374 Each element has the following form: |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3375 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3376 (REGEXP . PRIORITY) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3377 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3378 Where: |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3379 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3380 REGEXP regexp used to match non-numeric part of a version string. |
65668
bbff73cbd15c
(version-regexp-alist): Extend valid syntax for version strings:
Eli Zaretskii <eliz@gnu.org>
parents:
65150
diff
changeset
|
3381 It should begin with a `^' anchor and end with a `$' to |
bbff73cbd15c
(version-regexp-alist): Extend valid syntax for version strings:
Eli Zaretskii <eliz@gnu.org>
parents:
65150
diff
changeset
|
3382 prevent false hits. Letter-case is ignored while matching |
bbff73cbd15c
(version-regexp-alist): Extend valid syntax for version strings:
Eli Zaretskii <eliz@gnu.org>
parents:
65150
diff
changeset
|
3383 REGEXP. |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3384 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3385 PRIORITY negative integer which indicate the non-numeric priority.") |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3386 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3387 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3388 (defun version-to-list (ver) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3389 "Convert version string VER into an integer list. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3390 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3391 The version syntax is given by the following EBNF: |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3392 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3393 VERSION ::= NUMBER ( SEPARATOR NUMBER )*. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3394 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3395 NUMBER ::= (0|1|2|3|4|5|6|7|8|9)+. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3396 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3397 SEPARATOR ::= `version-separator' (which see) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3398 | `version-regexp-alist' (which see). |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3399 |
65668
bbff73cbd15c
(version-regexp-alist): Extend valid syntax for version strings:
Eli Zaretskii <eliz@gnu.org>
parents:
65150
diff
changeset
|
3400 The NUMBER part is optional if SEPARATOR is a match for an element |
bbff73cbd15c
(version-regexp-alist): Extend valid syntax for version strings:
Eli Zaretskii <eliz@gnu.org>
parents:
65150
diff
changeset
|
3401 in `version-regexp-alist'. |
bbff73cbd15c
(version-regexp-alist): Extend valid syntax for version strings:
Eli Zaretskii <eliz@gnu.org>
parents:
65150
diff
changeset
|
3402 |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3403 As an example of valid version syntax: |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3404 |
65668
bbff73cbd15c
(version-regexp-alist): Extend valid syntax for version strings:
Eli Zaretskii <eliz@gnu.org>
parents:
65150
diff
changeset
|
3405 1.0pre2 1.0.7.5 22.8beta3 0.9alpha1 6.9.30Beta |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3406 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3407 As an example of invalid version syntax: |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3408 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3409 1.0prepre2 1.0..7.5 22.8X3 alpha3.2 .5 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3410 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3411 As an example of version convertion: |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3412 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3413 String Version Integer List Version |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3414 \"1.0.7.5\" (1 0 7 5) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3415 \"1.0pre2\" (1 0 -1 2) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3416 \"1.0PRE2\" (1 0 -1 2) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3417 \"22.8beta3\" (22 8 -2 3) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3418 \"22.8Beta3\" (22 8 -2 3) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3419 \"0.9alpha1\" (0 9 -3 1) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3420 \"0.9AlphA1\" (0 9 -3 1) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3421 \"0.9alpha\" (0 9 -3) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3422 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3423 See documentation for `version-separator' and `version-regexp-alist'." |
67541
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3424 (or (and (stringp ver) (> (length ver) 0)) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3425 (error "Invalid version string: '%s'" ver)) |
67541
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3426 ;; Change .x.y to 0.x.y |
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3427 (if (and (>= (length ver) (length version-separator)) |
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3428 (string-equal (substring ver 0 (length version-separator)) |
77092
055a54275ec3
Fix indentation.
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
76960
diff
changeset
|
3429 version-separator)) |
67541
f9d4913b40bc
(version-regexp-alist): Allow space as separator before
Kim F. Storm <storm@cua.dk>
parents:
67274
diff
changeset
|
3430 (setq ver (concat "0" ver))) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3431 (save-match-data |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3432 (let ((i 0) |
65668
bbff73cbd15c
(version-regexp-alist): Extend valid syntax for version strings:
Eli Zaretskii <eliz@gnu.org>
parents:
65150
diff
changeset
|
3433 (case-fold-search t) ; ignore case in matching |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3434 lst s al) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3435 (while (and (setq s (string-match "[0-9]+" ver i)) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3436 (= s i)) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3437 ;; handle numeric part |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3438 (setq lst (cons (string-to-number (substring ver i (match-end 0))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3439 lst) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3440 i (match-end 0)) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3441 ;; handle non-numeric part |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3442 (when (and (setq s (string-match "[^0-9]+" ver i)) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3443 (= s i)) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3444 (setq s (substring ver i (match-end 0)) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3445 i (match-end 0)) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3446 ;; handle alpha, beta, pre, etc. separator |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3447 (unless (string= s version-separator) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3448 (setq al version-regexp-alist) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3449 (while (and al (not (string-match (caar al) s))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3450 (setq al (cdr al))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3451 (or al (error "Invalid version syntax: '%s'" ver)) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3452 (setq lst (cons (cdar al) lst))))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3453 (if (null lst) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3454 (error "Invalid version syntax: '%s'" ver) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3455 (nreverse lst))))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3456 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3457 |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3458 (defun version-list-< (l1 l2) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3459 "Return t if integer list L1 is lesser than L2. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3460 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3461 Note that integer list (1) is equal to (1 0), (1 0 0), (1 0 0 0), |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3462 etc. That is, the trailing zeroes are irrelevant. Also, integer |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3463 list (1) is greater than (1 -1) which is greater than (1 -2) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3464 which is greater than (1 -3)." |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3465 (while (and l1 l2 (= (car l1) (car l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3466 (setq l1 (cdr l1) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3467 l2 (cdr l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3468 (cond |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3469 ;; l1 not null and l2 not null |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3470 ((and l1 l2) (< (car l1) (car l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3471 ;; l1 null and l2 null ==> l1 length = l2 length |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3472 ((and (null l1) (null l2)) nil) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3473 ;; l1 not null and l2 null ==> l1 length > l2 length |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3474 (l1 (< (version-list-not-zero l1) 0)) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3475 ;; l1 null and l2 not null ==> l2 length > l1 length |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3476 (t (< 0 (version-list-not-zero l2))))) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3477 |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3478 |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3479 (defun version-list-= (l1 l2) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3480 "Return t if integer list L1 is equal to L2. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3481 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3482 Note that integer list (1) is equal to (1 0), (1 0 0), (1 0 0 0), |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3483 etc. That is, the trailing zeroes are irrelevant. Also, integer |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3484 list (1) is greater than (1 -1) which is greater than (1 -2) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3485 which is greater than (1 -3)." |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3486 (while (and l1 l2 (= (car l1) (car l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3487 (setq l1 (cdr l1) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3488 l2 (cdr l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3489 (cond |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3490 ;; l1 not null and l2 not null |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3491 ((and l1 l2) nil) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3492 ;; l1 null and l2 null ==> l1 length = l2 length |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3493 ((and (null l1) (null l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3494 ;; l1 not null and l2 null ==> l1 length > l2 length |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3495 (l1 (zerop (version-list-not-zero l1))) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3496 ;; l1 null and l2 not null ==> l2 length > l1 length |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3497 (t (zerop (version-list-not-zero l2))))) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3498 |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3499 |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3500 (defun version-list-<= (l1 l2) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3501 "Return t if integer list L1 is lesser than or equal to L2. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3502 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3503 Note that integer list (1) is equal to (1 0), (1 0 0), (1 0 0 0), |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3504 etc. That is, the trailing zeroes are irrelevant. Also, integer |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3505 list (1) is greater than (1 -1) which is greater than (1 -2) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3506 which is greater than (1 -3)." |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3507 (while (and l1 l2 (= (car l1) (car l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3508 (setq l1 (cdr l1) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3509 l2 (cdr l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3510 (cond |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3511 ;; l1 not null and l2 not null |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3512 ((and l1 l2) (< (car l1) (car l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3513 ;; l1 null and l2 null ==> l1 length = l2 length |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3514 ((and (null l1) (null l2))) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3515 ;; l1 not null and l2 null ==> l1 length > l2 length |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3516 (l1 (<= (version-list-not-zero l1) 0)) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3517 ;; l1 null and l2 not null ==> l2 length > l1 length |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3518 (t (<= 0 (version-list-not-zero l2))))) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3519 |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3520 (defun version-list-not-zero (lst) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3521 "Return the first non-zero element of integer list LST. |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3522 |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3523 If all LST elements are zeroes or LST is nil, return zero." |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3524 (while (and lst (zerop (car lst))) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3525 (setq lst (cdr lst))) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3526 (if lst |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3527 (car lst) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3528 ;; there is no element different of zero |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3529 0)) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3530 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3531 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3532 (defun version< (v1 v2) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3533 "Return t if version V1 is lesser than V2. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3534 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3535 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3536 etc. That is, the trailing \".0\"s are irrelevant. Also, version string \"1\" |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3537 is greater than \"1pre\" which is greater than \"1beta\" which is greater than |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3538 \"1alpha\"." |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3539 (version-list-< (version-to-list v1) (version-to-list v2))) |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3540 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3541 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3542 (defun version<= (v1 v2) |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3543 "Return t if version V1 is lesser than or equal to V2. |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3544 |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3545 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3546 etc. That is, the trailing \".0\"s are irrelevant. Also, version string \"1\" |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3547 is greater than \"1pre\" which is greater than \"1beta\" which is greater than |
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3548 \"1alpha\"." |
65150
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3549 (version-list-<= (version-to-list v1) (version-to-list v2))) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3550 |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3551 (defun version= (v1 v2) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3552 "Return t if version V1 is equal to V2. |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3553 |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3554 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3555 etc. That is, the trailing \".0\"s are irrelevant. Also, version string \"1\" |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3556 is greater than \"1pre\" which is greater than \"1beta\" which is greater than |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3557 \"1alpha\"." |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3558 (version-list-= (version-to-list v1) (version-to-list v2))) |
6d566cf5ad51
(version-list-<, version-list-<=, version-list-=)
Kim F. Storm <storm@cua.dk>
parents:
65114
diff
changeset
|
3559 |
65105
aad2616355a4
version string comparison
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents:
65058
diff
changeset
|
3560 |
59648
3054e8b6e73e
(dotimes-with-progress-reporter): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59161
diff
changeset
|
3561 |
57151
5350f17d0a78
(event-basic-type): Fix mask (extend to 22bits).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57148
diff
changeset
|
3562 ;; arch-tag: f7e0e6e5-70aa-4897-ae72-7a3511ec40bc |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
779
diff
changeset
|
3563 ;;; subr.el ends here |