Mercurial > hg > xemacs-beta
annotate lisp/subr.el @ 5631:5e256f495401
Don't error with a non-list plist, #'copy-symbol
lisp/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (copy-symbol): Don't error with a non-list plist, as
happens with symbols in abbrev tables.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 30 Dec 2011 13:55:07 +0000 |
| parents | b908c7265a2b |
| children | bd80d9103fc8 |
| rev | line source |
|---|---|
| 428 | 1 ;;; subr.el --- basic lisp subroutines for XEmacs |
| 2 | |
| 2525 | 3 ;; Copyright (C) 1985, 86, 92, 94, 95, 99, 2000, 2001, 2002, 2003 |
| 4 ;; Free Software Foundation, Inc. | |
| 428 | 5 ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp. |
| 6 ;; Copyright (C) 1995 Sun Microsystems. | |
| 1333 | 7 ;; Copyright (C) 2000, 2001, 2002, 2003 Ben Wing. |
| 428 | 8 |
| 9 ;; Maintainer: XEmacs Development Team | |
| 2525 | 10 ;; Keywords: extensions, dumped, internal |
| 428 | 11 |
| 12 ;; This file is part of XEmacs. | |
| 13 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5220
diff
changeset
|
14 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5220
diff
changeset
|
15 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5220
diff
changeset
|
16 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5220
diff
changeset
|
17 ;; option) any later version. |
| 428 | 18 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5220
diff
changeset
|
19 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5220
diff
changeset
|
20 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5220
diff
changeset
|
21 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5220
diff
changeset
|
22 ;; for more details. |
| 428 | 23 |
| 24 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5220
diff
changeset
|
25 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 26 |
| 1333 | 27 ;;; Synched up with: FSF 19.34. Some things synched up with later versions. |
| 428 | 28 |
| 29 ;;; Commentary: | |
| 30 | |
| 31 ;; This file is dumped with XEmacs. | |
| 32 | |
| 33 ;; There's not a whole lot in common now with the FSF version, | |
| 34 ;; be wary when applying differences. I've left in a number of lines | |
| 35 ;; of commentary just to give diff(1) something to synch itself with to | |
| 36 ;; provide useful context diffs. -sb | |
| 37 | |
| 1333 | 38 ;; BEGIN SYNCHED WITH FSF 21.2 |
| 39 | |
|
5284
d27c1ee1943b
Make the order of preloaded-file-list more sane.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
40 ;; XEmacs; no need for custom-declare-variable-list, preloaded-file-list is |
|
d27c1ee1943b
Make the order of preloaded-file-list more sane.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
41 ;; ordered to make it unnecessary. |
|
5281
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
42 |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
43 ;; XEmacs; this is here because we use it in backquote.el, so it needs to be |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
44 ;; available the first time a `(...) form is expanded. |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
45 (defun list* (first &rest rest) ; See compiler macro in cl-macs.el |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
46 "Return a new list with specified args as elements, cons'd to last arg. |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
47 Thus, `(list* A B C D)' is equivalent to `(nconc (list A B C) D)', or to |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
48 `(cons A (cons B (cons C D)))'." |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
49 (cond ((not rest) first) |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
50 ((not (cdr rest)) (cons first (car rest))) |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
51 (t (let* ((n (length rest)) |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
52 (copy (copy-sequence rest)) |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
53 (last (nthcdr (- n 2) copy))) |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
54 (setcdr last (car (cdr last))) |
|
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5220
diff
changeset
|
55 (cons first copy))))) |
| 428 | 56 |
| 57 ;;;; Lisp language features. | |
| 58 | |
| 59 (defmacro lambda (&rest cdr) | |
| 60 "Return a lambda expression. | |
| 61 A call of the form (lambda ARGS DOCSTRING INTERACTIVE BODY) is | |
| 62 self-quoting; the result of evaluating the lambda expression is the | |
| 63 expression itself. The lambda expression may then be treated as a | |
| 64 function, i.e., stored as the function value of a symbol, passed to | |
| 65 funcall or mapcar, etc. | |
| 66 | |
| 67 ARGS should take the same form as an argument list for a `defun'. | |
| 3842 | 68 Optional DOCSTRING is a documentation string. |
| 69 If present, it should describe how to call the function. Docstrings are | |
| 70 rarely useful unless the lambda will be named, eg, using `fset'. | |
| 71 Optional INTERACTIVE should be a call to the function `interactive'. | |
| 72 BODY should be a list of lisp expressions. | |
| 73 | |
| 74 The byte-compiler treats lambda expressions specially. If the lambda | |
| 75 expression is syntactically a function to be called, it will be compiled | |
| 76 unless protected by `quote'. Conversely, quoting a lambda expression with | |
| 77 `function' hints to the byte-compiler that it should compile the expression. | |
| 78 \(The byte-compiler may or may not actually compile it; for example it will | |
| 79 never compile lambdas nested in a data structure: `'(#'(lambda (x) x))'). | |
| 80 | |
| 81 The byte-compiler will warn about common problems such as the form | |
| 82 `(fset 'f '(lambda (x) x))' (the lambda cannot be byte-compiled; probably | |
| 83 the programmer intended `#'', although leaving the lambda unquoted will | |
| 84 normally suffice), but in general is it the programmer's responsibility to | |
| 85 quote lambda expressions appropriately." | |
| 428 | 86 `(function (lambda ,@cdr))) |
| 87 | |
|
5550
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
88 ;; Partial application of functions (related to currying). XEmacs; closures |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
89 ;; aren't yet available to us as a language type, but they're not necessary |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
90 ;; for this function (nor indeed is CL's #'lexical-let). See also the |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
91 ;; compiler macro in cl-macs.el, which generates a call to #'make-byte-code |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
92 ;; at runtime, ensuring that partially applied functions are byte-compiled. |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
93 (defun apply-partially (function &rest args) |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
94 "Return a function that is a partial application of FUNCTION to ARGS. |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
95 ARGS is a list of the first N arguments to pass to FUNCTION. |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
96 The result is a new function which does the same as FUNCTION, except that |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
97 the first N arguments are fixed at the values with which this function |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
98 was called." |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
99 `(lambda (&rest args) (apply ',function ,@(mapcar 'quote-maybe args) args))) |
|
b908c7265a2b
Add the #'apply-partially API, as used by GNU.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5522
diff
changeset
|
100 |
| 1333 | 101 ;; FSF 21.2 has various basic macros here. We don't because they're either |
| 102 ;; in cl*.el (which we dump and hence is always available) or built-in. | |
| 103 | |
| 104 ;; More powerful versions in cl.el. | |
| 105 ;(defmacro push (newelt listname) | |
| 106 ;(defmacro pop (listname) | |
| 107 | |
| 108 ;; Built-in. | |
| 109 ;(defmacro when (cond &rest body) | |
| 110 ;(defmacro unless (cond &rest body) | |
| 111 | |
| 112 ;; More powerful versions in cl-macs.el. | |
| 113 ;(defmacro dolist (spec &rest body) | |
| 114 ;(defmacro dotimes (spec &rest body) | |
| 115 | |
| 116 ;; In cl.el. Ours are defun, but cl arranges for them to be inlined anyway. | |
| 117 ;(defsubst caar (x) | |
| 118 ;(defsubst cadr (x) | |
| 119 ;(defsubst cdar (x) | |
| 120 ;(defsubst cddr (x) | |
| 121 | |
| 122 ;; Built-in. Our `last' is more powerful in that it handles circularity. | |
| 123 ;(defun last (x &optional n) | |
| 124 ;(defun butlast (x &optional n) | |
| 125 ;(defun nbutlast (x &optional n) | |
| 126 | |
| 428 | 127 (defmacro defun-when-void (&rest args) |
| 128 "Define a function, just like `defun', unless it's already defined. | |
| 129 Used for compatibility among different emacs variants." | |
| 130 `(if (fboundp ',(car args)) | |
| 131 nil | |
| 132 (defun ,@args))) | |
| 133 | |
| 134 (defmacro define-function-when-void (&rest args) | |
| 135 "Define a function, just like `define-function', unless it's already defined. | |
| 136 Used for compatibility among different emacs variants." | |
| 137 `(if (fboundp ,(car args)) | |
| 138 nil | |
| 139 (define-function ,@args))) | |
| 140 | |
| 141 | |
|
5338
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
142 (defun delete (item sequence) |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
143 "Delete by side effect any occurrences of ITEM as a member of SEQUENCE. |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
144 |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
145 The modified SEQUENCE is returned. Comparison is done with `equal'. |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
146 |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
147 If the first member of a list SEQUENCE is ITEM, there is no way to remove it |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
148 by side effect; therefore, write `(setq foo (delete element foo))' to be |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
149 sure of changing the value of `foo'. Also see: `remove'." |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
150 (delete* item sequence :test #'equal)) |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
151 |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
152 (defun delq (item sequence) |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
153 "Delete by side effect any occurrences of ITEM as a member of SEQUENCE. |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
154 |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
155 The modified SEQUENCE is returned. Comparison is done with `eq'. If |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
156 SEQUENCE is a list and its first member is ITEM, there is no way to remove |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
157 it by side effect; therefore, write `(setq foo (delq element foo))' to be |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
158 sure of changing the value of `foo'." |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
159 (delete* item sequence :test #'eq)) |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
160 |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
161 (defun remove (item sequence) |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
162 "Remove all occurrences of ITEM in SEQUENCE, testing with `equal'. |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
163 |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
164 This is a non-destructive function; it makes a copy of SEQUENCE if necessary |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
165 to avoid corrupting the original SEQUENCE. |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
166 Also see: `remove*', `delete', `delete*'" |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
167 (remove* item sequence :test #'equal)) |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
168 |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
169 (defun remq (item sequence) |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
170 "Remove all occurrences of ITEM in SEQUENCE, comparing with `eq'. |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
171 |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
172 This is a non-destructive function; it makes a copy of SEQUENCE to avoid |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
173 corrupting the original SEQUENCE. See also the more general `remove*'." |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
174 (remove* item sequence :test #'eq)) |
|
8608eadee6ba
Move #'delq, #'delete to Lisp, adding support for sequences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5327
diff
changeset
|
175 |
| 1333 | 176 (defun assoc-default (key alist &optional test default) |
| 177 "Find object KEY in a pseudo-alist ALIST. | |
| 178 ALIST is a list of conses or objects. Each element (or the element's car, | |
| 179 if it is a cons) is compared with KEY by evaluating (TEST (car elt) KEY). | |
| 180 If that is non-nil, the element matches; | |
| 181 then `assoc-default' returns the element's cdr, if it is a cons, | |
| 182 or DEFAULT if the element is not a cons. | |
| 183 | |
| 184 If no element matches, the value is nil. | |
| 185 If TEST is omitted or nil, `equal' is used." | |
| 186 (let (found (tail alist) value) | |
| 187 (while (and tail (not found)) | |
| 188 (let ((elt (car tail))) | |
| 189 (when (funcall (or test 'equal) (if (consp elt) (car elt) elt) key) | |
| 190 (setq found t value (if (consp elt) (cdr elt) default)))) | |
| 191 (setq tail (cdr tail))) | |
| 192 value)) | |
| 193 | |
| 194 (defun assoc-ignore-case (key alist) | |
| 195 "Like `assoc', but ignores differences in case and text representation. | |
| 196 KEY must be a string. Upper-case and lower-case letters are treated as equal." | |
|
5522
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
197 (assoc* (the string key) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
198 (the (and list (satisfies (lambda (list) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
199 (not (find-if-not 'stringp list |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
200 :key 'car))))) alist) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
201 :test 'equalp)) |
| 1333 | 202 |
| 203 (defun assoc-ignore-representation (key alist) | |
| 204 "Like `assoc', but ignores differences in text representation. | |
| 205 KEY must be a string." | |
|
5522
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
206 (assoc* (the string key) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
207 (the (and list (satisfies (lambda (list) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
208 (not (find-if-not 'stringp list |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
209 :key 'car))))) alist) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
210 :test 'equalp)) |
| 1333 | 211 |
| 212 (defun member-ignore-case (elt list) | |
| 213 "Like `member', but ignores differences in case and text representation. | |
| 214 ELT must be a string. Upper-case and lower-case letters are treated as equal." | |
|
5522
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
215 (member* (the string elt) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
216 (the (and list (satisfies (lambda (list) (every 'stringp list)))) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
217 list) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
218 :test 'equalp)) |
| 1333 | 219 |
| 428 | 220 ;;;; Keymap support. |
| 221 ;; XEmacs: removed to keymap.el | |
| 222 | |
| 223 ;;;; The global keymap tree. | |
| 224 | |
| 225 ;;; global-map, esc-map, and ctl-x-map have their values set up in | |
| 226 ;;; keymap.c; we just give them docstrings here. | |
| 227 | |
| 228 ;;;; Event manipulation functions. | |
| 229 | |
| 230 ;; XEmacs: This stuff is done in C Code. | |
| 231 | |
| 1333 | 232 ;;;; Obsolescent names for functions generally appear elsewhere, in |
| 233 ;;;; obsolete.el or in the files they are related do. Many very old | |
| 234 ;;;; obsolete stuff has been removed entirely (e.g. anything with `dot' in | |
| 235 ;;;; place of `point'). | |
| 236 | |
| 237 ; alternate names (not obsolete) | |
| 238 (if (not (fboundp 'mod)) (define-function 'mod '%)) | |
| 239 (define-function 'move-marker 'set-marker) | |
| 240 (define-function 'beep 'ding) ; preserve lingual purity | |
| 241 (define-function 'indent-to-column 'indent-to) | |
| 242 (define-function 'backward-delete-char 'delete-backward-char) | |
| 243 (define-function 'search-forward-regexp (symbol-function 're-search-forward)) | |
| 244 (define-function 'search-backward-regexp (symbol-function 're-search-backward)) | |
| 245 (define-function 'remove-directory 'delete-directory) | |
| 246 (define-function 'set-match-data 'store-match-data) | |
| 247 (define-function 'send-string-to-terminal 'external-debugging-output) | |
|
4905
755ae5b97edb
Change "special form" to "special operator" in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4817
diff
changeset
|
248 (define-function 'special-form-p 'special-operator-p) |
| 428 | 249 |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5004
diff
changeset
|
250 ;; XEmacs; this is in Lisp, its bytecode now taken by subseq. |
|
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5004
diff
changeset
|
251 (define-function 'substring 'subseq) |
|
5327
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
252 |
|
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
253 (define-function 'sort 'sort*) |
|
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
254 (define-function 'fillarray 'fill) |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5004
diff
changeset
|
255 |
| 428 | 256 ;; XEmacs: |
| 257 (defun local-variable-if-set-p (sym buffer) | |
| 258 "Return t if SYM would be local to BUFFER after it is set. | |
| 259 A nil value for BUFFER is *not* the same as (current-buffer), but | |
| 260 can be used to determine whether `make-variable-buffer-local' has been | |
| 261 called on SYM." | |
| 262 (local-variable-p sym buffer t)) | |
| 263 | |
| 264 | |
| 265 ;;;; Hook manipulation functions. | |
| 266 | |
| 267 ;; (defconst run-hooks 'run-hooks ...) | |
| 268 | |
| 269 (defun make-local-hook (hook) | |
| 270 "Make the hook HOOK local to the current buffer. | |
| 1333 | 271 The return value is HOOK. |
| 272 | |
| 273 You never need to call this function now that `add-hook' does it for you | |
| 274 if its LOCAL argument is non-nil. | |
| 275 | |
| 428 | 276 When a hook is local, its local and global values |
| 277 work in concert: running the hook actually runs all the hook | |
| 278 functions listed in *either* the local value *or* the global value | |
| 279 of the hook variable. | |
| 280 | |
| 281 This function works by making `t' a member of the buffer-local value, | |
| 282 which acts as a flag to run the hook functions in the default value as | |
| 283 well. This works for all normal hooks, but does not work for most | |
| 284 non-normal hooks yet. We will be changing the callers of non-normal | |
| 285 hooks so that they can handle localness; this has to be done one by | |
| 286 one. | |
| 287 | |
| 288 This function does nothing if HOOK is already local in the current | |
| 289 buffer. | |
| 290 | |
| 1333 | 291 Do not use `make-local-variable' to make a hook variable buffer-local." |
| 428 | 292 (if (local-variable-p hook (current-buffer)) ; XEmacs |
| 293 nil | |
| 294 (or (boundp hook) (set hook nil)) | |
| 295 (make-local-variable hook) | |
| 1333 | 296 (set hook (list t))) |
| 297 hook) | |
| 428 | 298 |
| 299 (defun add-hook (hook function &optional append local) | |
| 300 "Add to the value of HOOK the function FUNCTION. | |
| 301 FUNCTION is not added if already present. | |
| 302 FUNCTION is added (if necessary) at the beginning of the hook list | |
| 303 unless the optional argument APPEND is non-nil, in which case | |
| 304 FUNCTION is added at the end. | |
| 305 | |
| 306 The optional fourth argument, LOCAL, if non-nil, says to modify | |
| 307 the hook's buffer-local value rather than its default value. | |
| 1333 | 308 This makes the hook buffer-local if needed. |
| 428 | 309 To make a hook variable buffer-local, always use |
| 310 `make-local-hook', not `make-local-variable'. | |
| 311 | |
| 312 HOOK should be a symbol, and FUNCTION may be any valid function. If | |
| 313 HOOK is void, it is first set to nil. If HOOK's value is a single | |
| 442 | 314 function, it is changed to a list of functions. |
| 315 | |
| 316 You can remove this hook yourself using `remove-hook'. | |
| 317 | |
| 1333 | 318 See also `add-one-shot-hook'." |
| 428 | 319 (or (boundp hook) (set hook nil)) |
| 320 (or (default-boundp hook) (set-default hook nil)) | |
| 1333 | 321 (if local (unless (local-variable-if-set-p hook (current-buffer)) ; XEmacs |
| 322 (make-local-hook hook)) | |
| 323 ;; Detect the case where make-local-variable was used on a hook | |
| 324 ;; and do what we used to do. | |
| 325 (unless (and (consp (symbol-value hook)) (memq t (symbol-value hook))) | |
| 326 (setq local t))) | |
| 327 (let ((hook-value (if local (symbol-value hook) (default-value hook)))) | |
| 328 ;; If the hook value is a single function, turn it into a list. | |
| 329 (when (or (not (listp hook-value)) (eq (car hook-value) 'lambda)) | |
| 330 (setq hook-value (list hook-value))) | |
| 331 ;; Do the actual addition if necessary | |
| 332 (unless (member function hook-value) | |
| 333 (setq hook-value | |
| 334 (if append | |
| 335 (append hook-value (list function)) | |
| 336 (cons function hook-value)))) | |
| 337 ;; Set the actual variable | |
| 338 (if local (set hook hook-value) (set-default hook hook-value)))) | |
| 428 | 339 |
| 340 (defun remove-hook (hook function &optional local) | |
| 341 "Remove from the value of HOOK the function FUNCTION. | |
| 342 HOOK should be a symbol, and FUNCTION may be any valid function. If | |
| 343 FUNCTION isn't the value of HOOK, or, if FUNCTION doesn't appear in the | |
| 344 list of hooks to run in HOOK, then nothing is done. See `add-hook'. | |
| 345 | |
| 346 The optional third argument, LOCAL, if non-nil, says to modify | |
| 347 the hook's buffer-local value rather than its default value. | |
| 1333 | 348 This makes the hook buffer-local if needed. |
| 428 | 349 To make a hook variable buffer-local, always use |
| 350 `make-local-hook', not `make-local-variable'." | |
| 1333 | 351 (or (boundp hook) (set hook nil)) |
| 352 (or (default-boundp hook) (set-default hook nil)) | |
| 353 (if local (unless (local-variable-if-set-p hook (current-buffer)) ; XEmacs | |
| 354 (make-local-hook hook)) | |
| 355 ;; Detect the case where make-local-variable was used on a hook | |
| 356 ;; and do what we used to do. | |
| 357 (unless (and (consp (symbol-value hook)) (memq t (symbol-value hook))) | |
| 358 (setq local t))) | |
| 359 (let ((hook-value (if local (symbol-value hook) (default-value hook)))) | |
| 360 ;; Remove the function, for both the list and the non-list cases. | |
|
5522
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
361 ;; XEmacs: call #'remove-if, rather than delete, since we check for |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
362 ;; one-shot hooks too. |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
363 (if (or (not (listp hook-value)) (eq (car hook-value) 'lambda)) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
364 (if (equal hook-value function) (setq hook-value nil)) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
365 (setq hook-value |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
366 (remove-if #'(lambda (elt) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
367 (or (equal function elt) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
368 (and (symbolp elt) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
369 (equal function |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
370 (get elt 'one-shot-hook-fun))))) |
|
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
371 hook-value)) |
| 1333 | 372 ;; Set the actual variable |
| 373 (if local (set hook hook-value) (set-default hook hook-value))))) | |
| 442 | 374 |
| 375 ;; XEmacs addition | |
| 376 ;; #### we need a coherent scheme for indicating compatibility info, | |
| 377 ;; so that it can be programmatically retrieved. | |
| 378 (defun add-local-hook (hook function &optional append) | |
| 379 "Add to the local value of HOOK the function FUNCTION. | |
| 1333 | 380 You don't need this any more. It's equivalent to specifying the LOCAL |
| 381 argument to `add-hook'." | |
| 442 | 382 (add-hook hook function append t)) |
| 383 | |
| 384 ;; XEmacs addition | |
| 385 (defun remove-local-hook (hook function) | |
| 386 "Remove from the local value of HOOK the function FUNCTION. | |
| 1333 | 387 You don't need this any more. It's equivalent to specifying the LOCAL |
| 388 argument to `remove-hook'." | |
| 389 (remove-hook hook function t)) | |
| 442 | 390 |
| 391 (defun add-one-shot-hook (hook function &optional append local) | |
| 392 "Add to the value of HOOK the one-shot function FUNCTION. | |
| 393 FUNCTION will automatically be removed from the hook the first time | |
| 394 after it runs (whether to completion or to an error). | |
| 395 FUNCTION is not added if already present. | |
| 396 FUNCTION is added (if necessary) at the beginning of the hook list | |
| 397 unless the optional argument APPEND is non-nil, in which case | |
| 398 FUNCTION is added at the end. | |
| 399 | |
| 400 HOOK should be a symbol, and FUNCTION may be any valid function. If | |
| 401 HOOK is void, it is first set to nil. If HOOK's value is a single | |
| 402 function, it is changed to a list of functions. | |
| 403 | |
| 404 You can remove this hook yourself using `remove-hook'. | |
| 405 | |
| 1333 | 406 See also `add-hook'." |
| 442 | 407 (let ((sym (gensym))) |
| 408 (fset sym `(lambda (&rest args) | |
| 409 (unwind-protect | |
| 410 (apply ',function args) | |
| 411 (remove-hook ',hook ',sym ',local)))) | |
| 412 (put sym 'one-shot-hook-fun function) | |
| 413 (add-hook hook sym append local))) | |
| 414 | |
| 415 (defun add-local-one-shot-hook (hook function &optional append) | |
| 416 "Add to the local value of HOOK the one-shot function FUNCTION. | |
| 1333 | 417 You don't need this any more. It's equivalent to specifying the LOCAL |
| 418 argument to `add-one-shot-hook'." | |
| 442 | 419 (add-one-shot-hook hook function append t)) |
| 428 | 420 |
|
4461
42fad34efb3f
Support COMPARE-FN in add-to-list; thank you Brian Palmer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4369
diff
changeset
|
421 (defun add-to-list (list-var element &optional append compare-fn) |
| 428 | 422 "Add to the value of LIST-VAR the element ELEMENT if it isn't there yet. |
|
4461
42fad34efb3f
Support COMPARE-FN in add-to-list; thank you Brian Palmer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4369
diff
changeset
|
423 The test for presence of ELEMENT is done with COMPARE-FN; if |
|
42fad34efb3f
Support COMPARE-FN in add-to-list; thank you Brian Palmer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4369
diff
changeset
|
424 COMPARE-FN is nil, then it defaults to `equal'. If ELEMENT is added, |
|
42fad34efb3f
Support COMPARE-FN in add-to-list; thank you Brian Palmer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4369
diff
changeset
|
425 it is added at the beginning of the list, unless the optional argument |
|
42fad34efb3f
Support COMPARE-FN in add-to-list; thank you Brian Palmer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4369
diff
changeset
|
426 APPEND is non-nil, in which case ELEMENT is added at the end. |
| 878 | 427 |
| 428 | 428 If you want to use `add-to-list' on a variable that is not defined |
| 429 until a certain package is loaded, you should put the call to `add-to-list' | |
| 430 into a hook function that will be run only after loading the package. | |
| 431 `eval-after-load' provides one way to do this. In some cases | |
| 432 other hooks, such as major mode hooks, can do the job." | |
| 4463 | 433 (if (member* element (symbol-value list-var) :test (or compare-fn #'equal)) |
| 878 | 434 (symbol-value list-var) |
| 435 (set list-var | |
| 436 (if append | |
| 437 (append (symbol-value list-var) (list element)) | |
| 438 (cons element (symbol-value list-var)))))) | |
| 428 | 439 |
| 1333 | 440 ;; END SYNCHED WITH FSF 21.2 |
| 441 | |
| 428 | 442 ;; XEmacs additions |
| 443 ;; called by Fkill_buffer() | |
| 444 (defvar kill-buffer-hook nil | |
| 445 "Function or functions to be called when a buffer is killed. | |
| 446 The value of this variable may be buffer-local. | |
| 447 The buffer about to be killed is current when this hook is run.") | |
| 448 | |
| 449 ;; in C in FSFmacs | |
| 450 (defvar kill-emacs-hook nil | |
| 451 "Function or functions to be called when `kill-emacs' is called, | |
| 452 just before emacs is actually killed.") | |
| 453 | |
| 454 ;; not obsolete. | |
| 455 ;; #### These are a bad idea, because the CL RPLACA and RPLACD | |
| 456 ;; return the cons cell, not the new CAR/CDR. -hniksic | |
| 457 ;; The proper definition would be: | |
| 458 ;; (defun rplaca (conscell newcar) | |
| 459 ;; (setcar conscell newcar) | |
| 460 ;; conscell) | |
| 461 ;; ...and analogously for RPLACD. | |
| 462 (define-function 'rplaca 'setcar) | |
| 463 (define-function 'rplacd 'setcdr) | |
| 464 | |
| 465 (defun copy-symbol (symbol &optional copy-properties) | |
| 466 "Return a new uninterned symbol with the same name as SYMBOL. | |
| 467 If COPY-PROPERTIES is non-nil, the new symbol will have a copy of | |
| 468 SYMBOL's value, function, and property lists." | |
|
5631
5e256f495401
Don't error with a non-list plist, #'copy-symbol
Aidan Kehoe <kehoea@parhasard.net>
parents:
5550
diff
changeset
|
469 (let ((new (make-symbol (symbol-name symbol))) plist) |
| 428 | 470 (when copy-properties |
| 471 ;; This will not copy SYMBOL's chain of forwarding objects, but | |
| 472 ;; I think that's OK. Callers should not expect such magic to | |
| 473 ;; keep working in the copy in the first place. | |
| 474 (and (boundp symbol) | |
| 475 (set new (symbol-value symbol))) | |
| 476 (and (fboundp symbol) | |
| 477 (fset new (symbol-function symbol))) | |
|
5631
5e256f495401
Don't error with a non-list plist, #'copy-symbol
Aidan Kehoe <kehoea@parhasard.net>
parents:
5550
diff
changeset
|
478 (setq plist (symbol-plist symbol) |
|
5e256f495401
Don't error with a non-list plist, #'copy-symbol
Aidan Kehoe <kehoea@parhasard.net>
parents:
5550
diff
changeset
|
479 plist (if (consp plist) (copy-list plist) plist)) |
|
5e256f495401
Don't error with a non-list plist, #'copy-symbol
Aidan Kehoe <kehoea@parhasard.net>
parents:
5550
diff
changeset
|
480 (setplist new plist)) |
| 428 | 481 new)) |
| 482 | |
| 442 | 483 (defun set-symbol-value-in-buffer (sym val buffer) |
| 484 "Set the value of SYM to VAL in BUFFER. Useful with buffer-local variables. | |
| 485 If SYM has a buffer-local value in BUFFER, or will have one if set, this | |
| 486 function allows you to set the local value. | |
| 487 | |
| 488 NOTE: At some point, this will be moved into C and will be very fast." | |
| 489 (with-current-buffer buffer | |
| 490 (set sym val))) | |
| 444 | 491 |
| 1333 | 492 |
| 493 ;; BEGIN SYNCHED WITH FSF 21.2 | |
| 494 | |
|
5504
d3e0482c7899
Move #'split-path to subr.el, as was always the intention.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5488
diff
changeset
|
495 (defun split-path (path) |
|
d3e0482c7899
Move #'split-path to subr.el, as was always the intention.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5488
diff
changeset
|
496 "Explode a search path into a list of strings. |
|
d3e0482c7899
Move #'split-path to subr.el, as was always the intention.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5488
diff
changeset
|
497 The path components are separated with the characters specified |
|
d3e0482c7899
Move #'split-path to subr.el, as was always the intention.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5488
diff
changeset
|
498 with `path-separator'." |
|
5522
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
499 (while (not (and (stringp path-separator) (eql (length path-separator) 1))) |
|
5504
d3e0482c7899
Move #'split-path to subr.el, as was always the intention.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5488
diff
changeset
|
500 (setq path-separator (signal 'error (list "\ |
|
d3e0482c7899
Move #'split-path to subr.el, as was always the intention.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5488
diff
changeset
|
501 `path-separator' should be set to a single-character string" |
|
d3e0482c7899
Move #'split-path to subr.el, as was always the intention.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5488
diff
changeset
|
502 path-separator)))) |
|
d3e0482c7899
Move #'split-path to subr.el, as was always the intention.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5488
diff
changeset
|
503 (split-string-by-char path (aref path-separator 0))) |
|
d3e0482c7899
Move #'split-path to subr.el, as was always the intention.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5488
diff
changeset
|
504 |
| 1333 | 505 ; "Explode a search path into a list of strings. |
| 506 ;The path components are separated with the characters specified | |
| 507 ;with `path-separator'." | |
| 508 | |
| 509 (defmacro with-current-buffer (buffer &rest body) | |
| 510 "Temporarily make BUFFER the current buffer and execute the forms in BODY. | |
| 511 The value returned is the value of the last form in BODY. | |
| 512 See also `with-temp-buffer'." | |
| 513 `(save-current-buffer | |
| 514 (set-buffer ,buffer) | |
| 515 ,@body)) | |
| 516 | |
| 517 (defmacro with-temp-file (filename &rest forms) | |
| 518 "Create a new buffer, evaluate FORMS there, and write the buffer to FILENAME. | |
| 519 The value of the last form in FORMS is returned, like `progn'. | |
| 520 See also `with-temp-buffer'." | |
| 521 (let ((temp-file (make-symbol "temp-file")) | |
| 522 (temp-buffer (make-symbol "temp-buffer"))) | |
| 523 `(let ((,temp-file ,filename) | |
| 524 (,temp-buffer | |
| 525 (get-buffer-create (generate-new-buffer-name " *temp file*")))) | |
| 526 (unwind-protect | |
| 527 (prog1 | |
| 528 (with-current-buffer ,temp-buffer | |
| 529 ,@forms) | |
| 530 (with-current-buffer ,temp-buffer | |
| 531 (widen) | |
| 532 (write-region (point-min) (point-max) ,temp-file nil 0))) | |
| 533 (and (buffer-name ,temp-buffer) | |
| 534 (kill-buffer ,temp-buffer)))))) | |
| 535 | |
| 536 ;; FSF compatibility | |
| 537 (defmacro with-temp-message (message &rest body) | |
| 538 "Display MESSAGE temporarily while BODY is evaluated. | |
| 539 The original message is restored to the echo area after BODY has finished. | |
| 540 The value returned is the value of the last form in BODY. | |
| 541 If MESSAGE is nil, the echo area and message log buffer are unchanged. | |
| 542 Use a MESSAGE of \"\" to temporarily clear the echo area. | |
| 428 | 543 |
| 1333 | 544 Note that this function exists for FSF compatibility purposes. A better way |
| 545 under XEmacs is to give the message a particular label (see `display-message'); | |
| 546 then, the old message is automatically restored when you clear your message | |
| 547 with `clear-message'." | |
| 548 ;; FSF additional doc string from 21.2: | |
| 549 ;; MESSAGE is written to the message log buffer if `message-log-max' is non-nil. | |
| 550 (let ((current-message (make-symbol "current-message")) | |
| 551 (temp-message (make-symbol "with-temp-message"))) | |
| 552 `(let ((,temp-message ,message) | |
| 553 (,current-message)) | |
| 554 (unwind-protect | |
| 555 (progn | |
| 556 (when ,temp-message | |
| 557 (setq ,current-message (current-message)) | |
| 558 (message "%s" ,temp-message)) | |
| 559 ,@body) | |
| 560 (and ,temp-message ,current-message | |
| 561 (message "%s" ,current-message)))))) | |
| 562 | |
| 563 (defmacro with-temp-buffer (&rest forms) | |
| 564 "Create a temporary buffer, and evaluate FORMS there like `progn'. | |
| 565 See also `with-temp-file' and `with-output-to-string'." | |
| 566 (let ((temp-buffer (make-symbol "temp-buffer"))) | |
| 567 `(let ((,temp-buffer | |
| 568 (get-buffer-create (generate-new-buffer-name " *temp*")))) | |
| 569 (unwind-protect | |
| 570 (with-current-buffer ,temp-buffer | |
| 571 ,@forms) | |
| 572 (and (buffer-name ,temp-buffer) | |
| 573 (kill-buffer ,temp-buffer)))))) | |
| 574 | |
| 575 (defmacro with-output-to-string (&rest body) | |
| 576 "Execute BODY, return the text it sent to `standard-output', as a string." | |
| 577 `(let ((standard-output | |
| 578 (get-buffer-create (generate-new-buffer-name " *string-output*")))) | |
| 579 (let ((standard-output standard-output)) | |
| 580 ,@body) | |
| 581 (with-current-buffer standard-output | |
| 582 (prog1 | |
| 583 (buffer-string) | |
| 584 (kill-buffer nil))))) | |
| 585 | |
| 2135 | 586 (defmacro with-local-quit (&rest body) |
| 587 "Execute BODY with `inhibit-quit' temporarily bound to nil." | |
| 588 `(condition-case nil | |
| 589 (let ((inhibit-quit nil)) | |
| 590 ,@body) | |
| 591 (quit (setq quit-flag t)))) | |
| 592 | |
| 593 ;; FSF 21.3. | |
| 1333 | 594 |
| 595 ; (defmacro combine-after-change-calls (&rest body) | |
| 596 ; "Execute BODY, but don't call the after-change functions till the end. | |
| 597 ; If BODY makes changes in the buffer, they are recorded | |
| 598 ; and the functions on `after-change-functions' are called several times | |
| 599 ; when BODY is finished. | |
| 600 ; The return value is the value of the last form in BODY. | |
| 601 | |
| 602 ; If `before-change-functions' is non-nil, then calls to the after-change | |
| 603 ; functions can't be deferred, so in that case this macro has no effect. | |
| 604 | |
| 605 ; Do not alter `after-change-functions' or `before-change-functions' | |
| 606 ; in BODY." | |
| 2135 | 607 ; (declare (indent 0) (debug t)) |
| 1333 | 608 ; `(unwind-protect |
| 609 ; (let ((combine-after-change-calls t)) | |
| 610 ; . ,body) | |
| 611 ; (combine-after-change-execute))) | |
| 801 | 612 |
|
4369
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
613 (defmacro with-case-table (table &rest body) |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
614 "Execute the forms in BODY with TABLE as the current case table. |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
615 The value returned is the value of the last form in BODY." |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
616 (declare (indent 1) (debug t)) |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
617 (let ((old-case-table (make-symbol "table")) |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
618 (old-buffer (make-symbol "buffer"))) |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
619 `(let ((,old-case-table (current-case-table)) |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
620 (,old-buffer (current-buffer))) |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
621 (unwind-protect |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
622 (progn (set-case-table ,table) |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
623 ,@body) |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
624 (with-current-buffer ,old-buffer |
|
ef9eb714f0e4
Add ascii-case-table, #'with-case-table; make iso8859-1.el more comprehensible.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4329
diff
changeset
|
625 (set-case-table ,old-case-table)))))) |
| 2135 | 626 |
| 627 (defvar delay-mode-hooks nil | |
| 628 "If non-nil, `run-mode-hooks' should delay running the hooks.") | |
| 629 (defvar delayed-mode-hooks nil | |
| 630 "List of delayed mode hooks waiting to be run.") | |
| 631 (make-variable-buffer-local 'delayed-mode-hooks) | |
| 632 (put 'delay-mode-hooks 'permanent-local t) | |
| 633 | |
| 634 (defun run-mode-hooks (&rest hooks) | |
| 635 "Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS. | |
| 636 Execution is delayed if `delay-mode-hooks' is non-nil. | |
| 637 Major mode functions should use this." | |
| 638 (if delay-mode-hooks | |
| 639 ;; Delaying case. | |
| 640 (dolist (hook hooks) | |
| 641 (push hook delayed-mode-hooks)) | |
| 642 ;; Normal case, just run the hook as before plus any delayed hooks. | |
| 643 (setq hooks (nconc (nreverse delayed-mode-hooks) hooks)) | |
| 644 (setq delayed-mode-hooks nil) | |
| 645 (apply 'run-hooks hooks))) | |
| 646 | |
| 647 (defmacro delay-mode-hooks (&rest body) | |
| 648 "Execute BODY, but delay any `run-mode-hooks'. | |
| 649 Only affects hooks run in the current buffer." | |
| 650 `(progn | |
| 651 (make-local-variable 'delay-mode-hooks) | |
| 652 (let ((delay-mode-hooks t)) | |
| 653 ,@body))) | |
| 654 | |
| 1333 | 655 (defmacro with-syntax-table (table &rest body) |
| 656 "Evaluate BODY with syntax table of current buffer set to a copy of TABLE. | |
| 657 The syntax table of the current buffer is saved, BODY is evaluated, and the | |
| 658 saved table is restored, even in case of an abnormal exit. | |
| 659 Value is what BODY returns." | |
| 660 (let ((old-table (make-symbol "table")) | |
| 661 (old-buffer (make-symbol "buffer"))) | |
| 662 `(let ((,old-table (syntax-table)) | |
| 663 (,old-buffer (current-buffer))) | |
| 664 (unwind-protect | |
| 665 (progn | |
| 666 (set-syntax-table (copy-syntax-table ,table)) | |
| 667 ,@body) | |
| 668 (save-current-buffer | |
| 669 (set-buffer ,old-buffer) | |
| 670 (set-syntax-table ,old-table)))))) | |
| 671 | |
| 672 (put 'with-syntax-table 'lisp-indent-function 1) | |
| 673 (put 'with-syntax-table 'edebug-form-spec '(form body)) | |
| 674 | |
| 675 | |
| 676 ;; Moved from mule-coding.el. | |
| 677 (defmacro with-string-as-buffer-contents (str &rest body) | |
| 678 "With the contents of the current buffer being STR, run BODY. | |
|
4516
e96f3aca4d63
Document initial position of point in `with-string-as-buffer-contents'.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4504
diff
changeset
|
679 Point starts positioned to end of buffer. |
| 1333 | 680 Returns the new contents of the buffer, as modified by BODY. |
| 681 The original current buffer is restored afterwards." | |
| 682 `(with-temp-buffer | |
| 683 (insert ,str) | |
| 684 ,@body | |
| 685 (buffer-string))) | |
| 686 | |
| 687 | |
| 688 (defmacro save-match-data (&rest body) | |
| 689 "Execute BODY forms, restoring the global value of the match data." | |
| 690 (let ((original (make-symbol "match-data"))) | |
| 691 (list 'let (list (list original '(match-data))) | |
| 692 (list 'unwind-protect | |
| 693 (cons 'progn body) | |
| 694 (list 'store-match-data original))))) | |
| 695 | |
| 696 | |
| 697 (defun match-string (num &optional string) | |
| 698 "Return string of text matched by last search. | |
| 699 NUM specifies which parenthesized expression in the last regexp. | |
| 700 Value is nil if NUMth pair didn't match, or there were less than NUM pairs. | |
| 701 Zero means the entire text matched by the whole regexp or whole string. | |
| 702 STRING should be given if the last search was by `string-match' on STRING." | |
| 703 (if (match-beginning num) | |
| 704 (if string | |
| 705 (substring string (match-beginning num) (match-end num)) | |
| 706 (buffer-substring (match-beginning num) (match-end num))))) | |
| 801 | 707 |
| 1333 | 708 (defun match-string-no-properties (num &optional string) |
| 709 "Return string of text matched by last search, without text properties. | |
| 710 NUM specifies which parenthesized expression in the last regexp. | |
| 711 Value is nil if NUMth pair didn't match, or there were less than NUM pairs. | |
| 712 Zero means the entire text matched by the whole regexp or whole string. | |
| 713 STRING should be given if the last search was by `string-match' on STRING." | |
| 714 (if (match-beginning num) | |
| 715 (if string | |
| 716 (let ((result | |
| 717 (substring string (match-beginning num) (match-end num)))) | |
| 718 (set-text-properties 0 (length result) nil result) | |
| 719 result) | |
| 720 (buffer-substring-no-properties (match-beginning num) | |
| 721 (match-end num))))) | |
| 722 | |
|
5488
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
723 ;; Imported from GNU Emacs 23.3.1 -- dvl |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
724 (defun looking-back (regexp &optional limit greedy) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
725 "Return non-nil if text before point matches regular expression REGEXP. |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
726 Like `looking-at' except matches before point, and is slower. |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
727 LIMIT if non-nil speeds up the search by specifying a minimum |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
728 starting position, to avoid checking matches that would start |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
729 before LIMIT. |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
730 |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
731 If GREEDY is non-nil, extend the match backwards as far as |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
732 possible, stopping when a single additional previous character |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
733 cannot be part of a match for REGEXP. When the match is |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
734 extended, its starting position is allowed to occur before |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
735 LIMIT." |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
736 (let ((start (point)) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
737 (pos |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
738 (save-excursion |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
739 (and (re-search-backward (concat "\\(?:" regexp "\\)\\=") limit t) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
740 (point))))) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
741 (if (and greedy pos) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
742 (save-restriction |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
743 (narrow-to-region (point-min) start) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
744 (while (and (> pos (point-min)) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
745 (save-excursion |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
746 (goto-char pos) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
747 (backward-char 1) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
748 (looking-at (concat "\\(?:" regexp "\\)\\'")))) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
749 (setq pos (1- pos))) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
750 (save-excursion |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
751 (goto-char pos) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
752 (looking-at (concat "\\(?:" regexp "\\)\\'"))))) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
753 (not (null pos)))) |
|
1e544fd7be12
Import looking-back from GNU Emacs.
Didier Verna <didier@lrde.epita.fr>
parents:
5473
diff
changeset
|
754 |
| 1425 | 755 (defconst split-string-default-separators "[ \f\t\n\r\v]+" |
| 756 "The default value of separators for `split-string'. | |
| 757 | |
| 758 A regexp matching strings of whitespace. May be locale-dependent | |
| 759 \(as yet unimplemented). Should not match non-breaking spaces. | |
| 760 | |
| 761 Warning: binding this to a different value and using it as default is | |
| 762 likely to have undesired semantics.") | |
| 763 | |
| 764 ;; specification for `split-string' agreed with rms 2003-04-23 | |
| 765 ;; xemacs design <87vfx5vor0.fsf@tleepslib.sk.tsukuba.ac.jp> | |
| 766 | |
| 1495 | 767 ;; The specification says that if both SEPARATORS and OMIT-NULLS are |
| 768 ;; defaulted, OMIT-NULLS should be treated as t. Simplifying the logical | |
| 769 ;; expression leads to the equivalent implementation that if SEPARATORS | |
| 770 ;; is defaulted, OMIT-NULLS is treated as t. | |
| 771 | |
| 1425 | 772 (defun split-string (string &optional separators omit-nulls) |
| 773 "Splits STRING into substrings bounded by matches for SEPARATORS. | |
| 774 | |
| 775 The beginning and end of STRING, and each match for SEPARATORS, are | |
| 776 splitting points. The substrings matching SEPARATORS are removed, and | |
| 777 the substrings between the splitting points are collected as a list, | |
| 1333 | 778 which is returned. |
| 1425 | 779 |
| 2138 | 780 If SEPARATORS is non-`nil', it should be a regular expression matching text |
| 781 which separates, but is not part of, the substrings. If `nil' it defaults to | |
| 1495 | 782 `split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and |
| 2138 | 783 OMIT-NULLS is forced to `t'. |
| 1333 | 784 |
| 2138 | 785 If OMIT-NULLS is `t', zero-length substrings are omitted from the list \(so |
| 1425 | 786 that for the default value of SEPARATORS leading and trailing whitespace |
| 2138 | 787 are effectively trimmed). If `nil', all zero-length substrings are retained, |
| 1425 | 788 which correctly parses CSV format, for example. |
| 789 | |
| 1495 | 790 Note that the effect of `(split-string STRING)' is the same as |
| 791 `(split-string STRING split-string-default-separators t)'). In the rare | |
| 792 case that you wish to retain zero-length substrings when splitting on | |
| 793 whitespace, use `(split-string STRING split-string-default-separators nil)'. | |
| 1333 | 794 |
| 2138 | 795 Modifies the match data when successful; use `save-match-data' if necessary." |
| 1425 | 796 |
| 1495 | 797 (let ((keep-nulls (not (if separators omit-nulls t))) |
| 1425 | 798 (rexp (or separators split-string-default-separators)) |
| 1333 | 799 (start 0) |
| 800 notfirst | |
| 801 (list nil)) | |
| 802 (while (and (string-match rexp string | |
| 803 (if (and notfirst | |
| 804 (= start (match-beginning 0)) | |
| 805 (< start (length string))) | |
| 806 (1+ start) start)) | |
| 1425 | 807 (< start (length string))) |
| 1333 | 808 (setq notfirst t) |
| 1425 | 809 (if (or keep-nulls (< start (match-beginning 0))) |
| 1333 | 810 (setq list |
| 811 (cons (substring string start (match-beginning 0)) | |
| 812 list))) | |
| 813 (setq start (match-end 0))) | |
| 1425 | 814 (if (or keep-nulls (< start (length string))) |
| 1333 | 815 (setq list |
| 816 (cons (substring string start) | |
| 817 list))) | |
| 818 (nreverse list))) | |
| 819 | |
| 820 (defun subst-char-in-string (fromchar tochar string &optional inplace) | |
| 821 "Replace FROMCHAR with TOCHAR in STRING each time it occurs. | |
| 822 Unless optional argument INPLACE is non-nil, return a new string." | |
|
5321
57a64ab2ae45
Implement some basic Lisp functions in terms of Common Lisp builtins.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5284
diff
changeset
|
823 (funcall (if inplace #'nsubstitute #'substitute) tochar fromchar |
|
57a64ab2ae45
Implement some basic Lisp functions in terms of Common Lisp builtins.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5284
diff
changeset
|
824 (the string string) :test #'eq)) |
| 1333 | 825 |
| 826 ;; XEmacs addition: | |
| 428 | 827 (defun replace-in-string (str regexp newtext &optional literal) |
| 828 "Replace all matches in STR for REGEXP with NEWTEXT string, | |
| 829 and returns the new string. | |
| 830 Optional LITERAL non-nil means do a literal replacement. | |
| 442 | 831 Otherwise treat `\\' in NEWTEXT as special: |
| 832 `\\&' in NEWTEXT means substitute original matched text. | |
| 833 `\\N' means substitute what matched the Nth `\\(...\\)'. | |
| 834 If Nth parens didn't match, substitute nothing. | |
| 835 `\\\\' means insert one `\\'. | |
| 836 `\\u' means upcase the next character. | |
| 837 `\\l' means downcase the next character. | |
| 838 `\\U' means begin upcasing all following characters. | |
| 839 `\\L' means begin downcasing all following characters. | |
| 840 `\\E' means terminate the effect of any `\\U' or `\\L'." | |
| 428 | 841 (check-argument-type 'stringp str) |
| 842 (check-argument-type 'stringp newtext) | |
| 442 | 843 (if (> (length str) 50) |
| 924 | 844 (let ((cfs case-fold-search)) |
| 845 (with-temp-buffer | |
| 846 (setq case-fold-search cfs) | |
| 847 (insert str) | |
| 848 (goto-char 1) | |
| 442 | 849 (while (re-search-forward regexp nil t) |
| 850 (replace-match newtext t literal)) | |
| 924 | 851 (buffer-string))) |
| 852 (let ((start 0) newstr) | |
| 853 (while (string-match regexp str start) | |
| 854 (setq newstr (replace-match newtext t literal str) | |
| 855 start (+ (match-end 0) (- (length newstr) (length str))) | |
| 856 str newstr)) | |
| 857 str))) | |
| 428 | 858 |
| 1333 | 859 (defun replace-regexp-in-string (regexp rep string &optional |
| 860 fixedcase literal subexp start) | |
| 861 "Replace all matches for REGEXP with REP in STRING. | |
| 862 | |
| 863 Return a new string containing the replacements. | |
| 864 | |
| 4199 | 865 Optional arguments FIXEDCASE and LITERAL are like the arguments with |
| 866 the same names of function `replace-match'. If START is non-nil, | |
| 867 start replacements at that index in STRING. | |
| 868 | |
| 869 For compatibility with old XEmacs code and with recent GNU Emacs, the | |
| 870 interpretation of SUBEXP is somewhat complicated. If SUBEXP is a | |
| 871 buffer, it is interpreted as the buffer which provides syntax tables | |
| 872 and case tables for the match and replacement. If it is not a buffer, | |
| 873 the current buffer is used. If SUBEXP is an integer, it is the index | |
| 874 of the subexpression of REGEXP which is to be replaced. | |
| 428 | 875 |
| 1333 | 876 REP is either a string used as the NEWTEXT arg of `replace-match' or a |
| 877 function. If it is a function it is applied to each match to generate | |
| 878 the replacement passed to `replace-match'; the match-data at this | |
| 4199 | 879 point are such that `(match-string SUBEXP STRING)' is the function's |
| 880 argument if SUBEXP is an integer \(otherwise the whole match is passed | |
| 881 and replaced). | |
| 428 | 882 |
| 1333 | 883 To replace only the first match (if any), make REGEXP match up to \\' |
| 884 and replace a sub-expression, e.g. | |
| 885 (replace-regexp-in-string \"\\(foo\\).*\\'\" \"bar\" \" foo foo\" nil nil 1) | |
| 886 => \" bar foo\" | |
| 4199 | 887 |
| 888 Signals `invalid-argument' if SUBEXP is not an integer, buffer, or nil; | |
| 889 or is an integer, but the indicated subexpression was not matched. | |
| 890 Signals `invalid-argument' if STRING is nil but the last text matched was a string, | |
| 891 or if STRING is a string but the last text matched was a buffer." | |
| 428 | 892 |
| 1333 | 893 ;; To avoid excessive consing from multiple matches in long strings, |
| 894 ;; don't just call `replace-match' continually. Walk down the | |
| 895 ;; string looking for matches of REGEXP and building up a (reversed) | |
| 896 ;; list MATCHES. This comprises segments of STRING which weren't | |
| 897 ;; matched interspersed with replacements for segments that were. | |
| 898 ;; [For a `large' number of replacments it's more efficient to | |
| 899 ;; operate in a temporary buffer; we can't tell from the function's | |
| 900 ;; args whether to choose the buffer-based implementation, though it | |
| 901 ;; might be reasonable to do so for long enough STRING.] | |
| 902 (let ((l (length string)) | |
| 903 (start (or start 0)) | |
| 4199 | 904 (expndx (if (integerp subexp) subexp 0)) |
| 1333 | 905 matches str mb me) |
| 906 (save-match-data | |
| 907 (while (and (< start l) (string-match regexp string start)) | |
| 908 (setq mb (match-beginning 0) | |
| 909 me (match-end 0)) | |
| 910 ;; If we matched the empty string, make sure we advance by one char | |
| 911 (when (= me mb) (setq me (min l (1+ mb)))) | |
| 912 ;; Generate a replacement for the matched substring. | |
| 913 ;; Operate only on the substring to minimize string consing. | |
| 914 ;; Set up match data for the substring for replacement; | |
| 915 ;; presumably this is likely to be faster than munging the | |
| 916 ;; match data directly in Lisp. | |
| 917 (string-match regexp (setq str (substring string mb me))) | |
| 918 (setq matches | |
| 919 (cons (replace-match (if (stringp rep) | |
| 920 rep | |
| 4199 | 921 (funcall rep (match-string expndx str))) |
| 922 ;; no, this subexp shouldn't be expndx | |
| 1333 | 923 fixedcase literal str subexp) |
| 924 (cons (substring string start mb) ; unmatched prefix | |
| 925 matches))) | |
| 926 (setq start me)) | |
| 927 ;; Reconstruct a string from the pieces. | |
| 928 (setq matches (cons (substring string start l) matches)) ; leftover | |
| 929 (apply #'concat (nreverse matches))))) | |
| 428 | 930 |
| 1333 | 931 ;; END SYNCHED WITH FSF 21.2 |
| 932 | |
| 933 | |
| 1899 | 934 ;; BEGIN SYNCHED WITH FSF 21.3 |
| 935 | |
| 936 (defun add-to-invisibility-spec (arg) | |
| 937 "Add elements to `buffer-invisibility-spec'. | |
| 938 See documentation for `buffer-invisibility-spec' for the kind of elements | |
| 939 that can be added." | |
| 940 (if (eq buffer-invisibility-spec t) | |
| 941 (setq buffer-invisibility-spec (list t))) | |
| 942 (setq buffer-invisibility-spec | |
| 943 (cons arg buffer-invisibility-spec))) | |
| 944 | |
| 945 (defun remove-from-invisibility-spec (arg) | |
| 946 "Remove elements from `buffer-invisibility-spec'." | |
| 947 (if (consp buffer-invisibility-spec) | |
| 948 (setq buffer-invisibility-spec (delete arg buffer-invisibility-spec)))) | |
| 949 | |
| 950 ;; END SYNCHED WITH FSF 21.3 | |
| 951 | |
| 952 | |
| 1333 | 953 ;;; Basic string functions |
| 883 | 954 |
| 1333 | 955 ;; XEmacs |
| 956 (defun string-equal-ignore-case (str1 str2) | |
| 957 "Return t if two strings have identical contents, ignoring case differences. | |
| 958 Case is not significant. Text properties and extents are ignored. | |
| 959 Symbols are also allowed; their print names are used instead. | |
| 428 | 960 |
| 1333 | 961 See also `equalp'." |
| 962 (if (symbolp str1) | |
| 963 (setq str1 (symbol-name str1))) | |
| 964 (if (symbolp str2) | |
| 965 (setq str2 (symbol-name str2))) | |
| 966 (eq t (compare-strings str1 nil nil str2 nil nil t))) | |
| 428 | 967 |
| 968 (defun insert-face (string face) | |
| 969 "Insert STRING and highlight with FACE. Return the extent created." | |
| 970 (let ((p (point)) ext) | |
| 971 (insert string) | |
| 972 (setq ext (make-extent p (point))) | |
| 973 (set-extent-face ext face) | |
| 974 ext)) | |
| 975 | |
| 976 ;; not obsolete. | |
| 977 (define-function 'string= 'string-equal) | |
| 978 (define-function 'string< 'string-lessp) | |
| 979 (define-function 'int-to-string 'number-to-string) | |
| 980 (define-function 'string-to-int 'string-to-number) | |
| 981 | |
| 982 ;; These two names are a bit awkward, as they conflict with the normal | |
| 983 ;; foo-to-bar naming scheme, but CLtL2 has them, so they stay. | |
| 984 (define-function 'char-int 'char-to-int) | |
| 985 (define-function 'int-char 'int-to-char) | |
| 986 | |
|
4329
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
987 ;; XEmacs addition. |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
988 (defun integer-to-bit-vector (integer &optional minlength) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
989 "Return INTEGER converted to a bit vector. |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
990 Optional argument MINLENGTH gives a minimum length for the returned vector. |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
991 If MINLENGTH is not given, zero high-order bits will be ignored." |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
992 (check-argument-type #'integerp integer) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
993 (setq minlength (or minlength 0)) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
994 (check-nonnegative-number minlength) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
995 (read (format (format "#*%%0%db" minlength) integer))) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
996 |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
997 ;; XEmacs addition. |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
998 (defun bit-vector-to-integer (bit-vector) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
999 "Return BIT-VECTOR converted to an integer. |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
1000 If bignum support is available, BIT-VECTOR's length is unlimited. |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
1001 Otherwise the limit is the number of value bits in an Lisp integer. " |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
1002 (check-argument-type #'bit-vector-p bit-vector) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
1003 (setq bit-vector (prin1-to-string bit-vector)) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
1004 (aset bit-vector 1 ?b) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
1005 (read bit-vector)) |
|
d9eb5ea14f65
Provide %b in #'format; use it for converting between ints and bit vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4267
diff
changeset
|
1006 |
| 771 | 1007 (defun string-width (string) |
| 1008 "Return number of columns STRING occupies when displayed. | |
| 1009 With international (Mule) support, uses the charset-columns attribute of | |
| 1010 the characters in STRING, which may not accurately represent the actual | |
| 1011 display width when using a window system. With no international support, | |
| 1012 simply returns the length of the string." | |
|
5321
57a64ab2ae45
Implement some basic Lisp functions in terms of Common Lisp builtins.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5284
diff
changeset
|
1013 (reduce #'+ (the string string) :initial-value 0 :key #'char-width)) |
| 771 | 1014 |
| 777 | 1015 (defun char-width (character) |
| 1016 "Return number of columns a CHARACTER occupies when displayed." | |
|
5321
57a64ab2ae45
Implement some basic Lisp functions in terms of Common Lisp builtins.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5284
diff
changeset
|
1017 (charset-width (char-charset character))) |
| 777 | 1018 |
| 1019 ;; The following several functions are useful in GNU Emacs 20 because | |
| 1020 ;; of the multibyte "characters" the internal representation of which | |
| 1021 ;; leaks into Lisp. In XEmacs/Mule they are trivial and unnecessary. | |
| 1022 ;; We provide them for compatibility reasons solely. | |
| 1023 | |
| 1024 (defun string-to-sequence (string type) | |
| 1025 "Convert STRING to a sequence of TYPE which contains characters in STRING. | |
| 1026 TYPE should be `list' or `vector'." | |
| 1027 (ecase type | |
| 1028 (list | |
| 4267 | 1029 (append string nil)) |
| 777 | 1030 (vector |
| 4267 | 1031 (vconcat string)))) |
| 777 | 1032 |
| 1033 (defun string-to-list (string) | |
| 1034 "Return a list of characters in STRING." | |
| 4267 | 1035 (append string nil)) |
| 777 | 1036 |
| 1037 (defun string-to-vector (string) | |
| 1038 "Return a vector of characters in STRING." | |
| 4267 | 1039 (vconcat string)) |
| 777 | 1040 |
| 1041 (defun store-substring (string idx obj) | |
| 1042 "Embed OBJ (string or character) at index IDX of STRING." | |
|
5321
57a64ab2ae45
Implement some basic Lisp functions in terms of Common Lisp builtins.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5284
diff
changeset
|
1043 (if (stringp obj) |
|
57a64ab2ae45
Implement some basic Lisp functions in terms of Common Lisp builtins.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5284
diff
changeset
|
1044 (replace (the string string) obj :start1 idx) |
|
57a64ab2ae45
Implement some basic Lisp functions in terms of Common Lisp builtins.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5284
diff
changeset
|
1045 (prog1 string (aset string idx obj)))) |
| 777 | 1046 |
| 851 | 1047 ;; From FSF 21.1; ELLIPSES is XEmacs addition. |
| 1048 | |
| 1049 (defun truncate-string-to-width (str end-column &optional start-column padding | |
| 1333 | 1050 ellipses) |
| 777 | 1051 "Truncate string STR to end at column END-COLUMN. |
| 814 | 1052 The optional 3rd arg START-COLUMN, if non-nil, specifies |
| 777 | 1053 the starting column; that means to return the characters occupying |
| 1054 columns START-COLUMN ... END-COLUMN of STR. | |
| 1055 | |
| 814 | 1056 The optional 4th arg PADDING, if non-nil, specifies a padding character |
| 777 | 1057 to add at the end of the result if STR doesn't reach column END-COLUMN, |
| 1058 or if END-COLUMN comes in the middle of a character in STR. | |
| 1059 PADDING is also added at the beginning of the result | |
| 1060 if column START-COLUMN appears in the middle of a character in STR. | |
| 1061 | |
| 1062 If PADDING is nil, no padding is added in these cases, so | |
| 851 | 1063 the resulting string may be narrower than END-COLUMN. |
| 1064 | |
| 1065 BUG: Currently assumes that the padding character is of width one. You | |
| 1066 will get weird results if not. | |
| 1067 | |
| 1068 If ELLIPSES is non-nil, add ellipses (specified by ELLIPSES if a string, | |
| 1069 else `...') if STR extends past END-COLUMN. The ellipses will be added in | |
| 1070 such a way that the total string occupies no more than END-COLUMN columns | |
| 1071 -- i.e. if the string goes past END-COLUMN, it will be truncated somewhere | |
| 1072 short of END-COLUMN so that, with the ellipses added (and padding, if the | |
| 1073 proper place to truncate the string would be in the middle of a character), | |
| 1074 the string occupies exactly END-COLUMN columns." | |
| 777 | 1075 (or start-column |
| 1076 (setq start-column 0)) | |
| 814 | 1077 (let ((len (length str)) |
| 1078 (idx 0) | |
| 1079 (column 0) | |
| 1080 (head-padding "") (tail-padding "") | |
| 1081 ch last-column last-idx from-idx) | |
| 851 | 1082 |
| 1083 ;; find the index of START-COLUMN; bail out if end of string reached. | |
| 814 | 1084 (condition-case nil |
| 1085 (while (< column start-column) | |
| 1086 (setq ch (aref str idx) | |
| 1087 column (+ column (char-width ch)) | |
| 1088 idx (1+ idx))) | |
| 1089 (args-out-of-range (setq idx len))) | |
| 1090 (if (< column start-column) | |
| 851 | 1091 ;; if string ends before START-COLUMN, return either a blank string |
| 1092 ;; or a string entirely padded. | |
| 1093 (if padding (make-string (- end-column start-column) padding) "") | |
| 814 | 1094 (if (and padding (> column start-column)) |
| 1095 (setq head-padding (make-string (- column start-column) padding))) | |
| 1096 (setq from-idx idx) | |
| 851 | 1097 ;; If END-COLUMN is before START-COLUMN, then bail out. |
| 814 | 1098 (if (< end-column column) |
| 851 | 1099 (setq idx from-idx ellipses "") |
| 1100 | |
| 1101 ;; handle ELLIPSES | |
| 1102 (cond ((null ellipses) (setq ellipses "")) | |
| 1103 ((if (<= (string-width str) end-column) | |
| 1104 ;; string fits, no ellipses | |
| 1105 (setq ellipses ""))) | |
| 1106 (t | |
| 1107 ;; else, insert default value and ... | |
| 1108 (or (stringp ellipses) (setq ellipses "...")) | |
| 1109 ;; ... take away the width of the ellipses from the | |
| 1110 ;; destination. do all computations with new, shorter | |
| 1111 ;; width. the padding computed will get us exactly up to | |
| 1112 ;; the shorted width, which is right -- it just gets added | |
| 1113 ;; to the right of the ellipses. | |
| 924 | 1114 (setq end-column (- end-column (string-width ellipses))))) |
| 851 | 1115 |
| 1116 ;; find the index of END-COLUMN; bail out if end of string reached. | |
| 814 | 1117 (condition-case nil |
| 1118 (while (< column end-column) | |
| 1119 (setq last-column column | |
| 1120 last-idx idx | |
| 1121 ch (aref str idx) | |
| 1122 column (+ column (char-width ch)) | |
| 1123 idx (1+ idx))) | |
| 1124 (args-out-of-range (setq idx len))) | |
| 851 | 1125 ;; if we went too far (stopped in middle of character), back up. |
| 814 | 1126 (if (> column end-column) |
| 1127 (setq column last-column idx last-idx)) | |
| 851 | 1128 ;; compute remaining padding |
| 814 | 1129 (if (and padding (< column end-column)) |
| 1130 (setq tail-padding (make-string (- end-column column) padding)))) | |
| 851 | 1131 ;; get substring ... |
| 814 | 1132 (setq str (substring str from-idx idx)) |
| 851 | 1133 ;; and construct result |
| 814 | 1134 (if padding |
| 851 | 1135 (concat head-padding str tail-padding ellipses) |
| 1136 (concat str ellipses))))) | |
| 801 | 1137 |
| 428 | 1138 |
| 1139 ;; alist/plist functions | |
| 1140 (defun plist-to-alist (plist) | |
| 1141 "Convert property list PLIST into the equivalent association-list form. | |
| 1142 The alist is returned. This converts from | |
| 1143 | |
| 1144 \(a 1 b 2 c 3) | |
| 1145 | |
| 1146 into | |
| 1147 | |
| 1148 \((a . 1) (b . 2) (c . 3)) | |
| 1149 | |
| 1150 The original plist is not modified. See also `destructive-plist-to-alist'." | |
| 1151 (let (alist) | |
| 1152 (while plist | |
| 1153 (setq alist (cons (cons (car plist) (cadr plist)) alist)) | |
| 1154 (setq plist (cddr plist))) | |
| 1155 (nreverse alist))) | |
| 1156 | |
|
4806
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1157 ((macro |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1158 . (lambda (map-plist-definition) |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1159 "Replace the variable names in MAP-PLIST-DEFINITION with uninterned |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1160 symbols, avoiding the risk of interference with variables in other functions |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1161 introduced by dynamic scope." |
|
5327
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
1162 (nsublis '((mp-function . #:function) |
|
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
1163 (plist . #:plist) |
|
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
1164 (result . #:result)) |
|
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
1165 ;; Need to specify #'eq as the test, otherwise we have a |
|
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
1166 ;; bootstrap issue, since #'eql is in cl.el, loaded after |
|
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
1167 ;; this file. |
|
d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5321
diff
changeset
|
1168 map-plist-definition :test #'eq))) |
|
4806
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1169 (defun map-plist (mp-function plist) |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1170 "Map FUNCTION (a function of two args) over each key/value pair in PLIST. |
| 783 | 1171 Return a list of the results." |
|
4806
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1172 (let (result) |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1173 (while plist |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1174 (push (funcall mp-function (car plist) (cadr plist)) result) |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1175 (setq plist (cddr plist))) |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1176 (nreverse result)))) |
| 783 | 1177 |
| 428 | 1178 (defun destructive-plist-to-alist (plist) |
| 1179 "Convert property list PLIST into the equivalent association-list form. | |
| 1180 The alist is returned. This converts from | |
| 1181 | |
| 1182 \(a 1 b 2 c 3) | |
| 1183 | |
| 1184 into | |
| 1185 | |
| 1186 \((a . 1) (b . 2) (c . 3)) | |
| 1187 | |
| 1188 The original plist is destroyed in the process of constructing the alist. | |
| 1189 See also `plist-to-alist'." | |
| 1190 (let ((head plist) | |
| 1191 next) | |
| 1192 (while plist | |
| 1193 ;; remember the next plist pair. | |
| 1194 (setq next (cddr plist)) | |
| 1195 ;; make the cons holding the property value into the alist element. | |
| 1196 (setcdr (cdr plist) (cadr plist)) | |
| 1197 (setcar (cdr plist) (car plist)) | |
| 1198 ;; reattach into alist form. | |
| 1199 (setcar plist (cdr plist)) | |
| 1200 (setcdr plist next) | |
| 1201 (setq plist next)) | |
| 1202 head)) | |
| 1203 | |
| 1204 (defun alist-to-plist (alist) | |
| 1205 "Convert association list ALIST into the equivalent property-list form. | |
| 1206 The plist is returned. This converts from | |
| 1207 | |
| 1208 \((a . 1) (b . 2) (c . 3)) | |
| 1209 | |
| 1210 into | |
| 1211 | |
| 1212 \(a 1 b 2 c 3) | |
| 1213 | |
| 1214 The original alist is not modified. See also `destructive-alist-to-plist'." | |
| 1215 (let (plist) | |
| 1216 (while alist | |
| 1217 (let ((el (car alist))) | |
| 1218 (setq plist (cons (cdr el) (cons (car el) plist)))) | |
| 1219 (setq alist (cdr alist))) | |
| 1220 (nreverse plist))) | |
| 1221 | |
| 1222 ;; getf, remf in cl*.el. | |
| 1223 | |
| 444 | 1224 (defmacro putf (plist property value) |
| 1225 "Add property PROPERTY to plist PLIST with value VALUE. | |
| 1226 Analogous to (setq PLIST (plist-put PLIST PROPERTY VALUE))." | |
| 1227 `(setq ,plist (plist-put ,plist ,property ,value))) | |
| 428 | 1228 |
| 444 | 1229 (defmacro laxputf (lax-plist property value) |
| 1230 "Add property PROPERTY to lax plist LAX-PLIST with value VALUE. | |
| 1231 Analogous to (setq LAX-PLIST (lax-plist-put LAX-PLIST PROPERTY VALUE))." | |
| 1232 `(setq ,lax-plist (lax-plist-put ,lax-plist ,property ,value))) | |
| 428 | 1233 |
| 444 | 1234 (defmacro laxremf (lax-plist property) |
| 1235 "Remove property PROPERTY from lax plist LAX-PLIST. | |
| 1236 Analogous to (setq LAX-PLIST (lax-plist-remprop LAX-PLIST PROPERTY))." | |
| 1237 `(setq ,lax-plist (lax-plist-remprop ,lax-plist ,property))) | |
| 428 | 1238 |
| 1239 ;;; Error functions | |
| 1240 | |
| 442 | 1241 (defun error (datum &rest args) |
| 1242 "Signal a non-continuable error. | |
| 1243 DATUM should normally be an error symbol, i.e. a symbol defined using | |
| 1244 `define-error'. ARGS will be made into a list, and DATUM and ARGS passed | |
| 1245 as the two arguments to `signal', the most basic error handling function. | |
| 1246 | |
| 428 | 1247 This error is not continuable: you cannot continue execution after the |
| 442 | 1248 error using the debugger `r' command. See also `cerror'. |
| 1249 | |
| 1250 The correct semantics of ARGS varies from error to error, but for most | |
| 1251 errors that need to be generated in Lisp code, the first argument | |
| 1252 should be a string describing the *context* of the error (i.e. the | |
| 1253 exact operation being performed and what went wrong), and the remaining | |
| 1254 arguments or \"frobs\" (most often, there is one) specify the | |
| 1255 offending object(s) and/or provide additional details such as the exact | |
| 1256 error when a file error occurred, e.g.: | |
| 1257 | |
| 1258 -- the buffer in which an editing error occurred. | |
| 1259 -- an invalid value that was encountered. (In such cases, the string | |
| 1260 should describe the purpose or \"semantics\" of the value [e.g. if the | |
| 1261 value is an argument to a function, the name of the argument; if the value | |
| 1262 is the value corresponding to a keyword, the name of the keyword; if the | |
| 1263 value is supposed to be a list length, say this and say what the purpose | |
| 1264 of the list is; etc.] as well as specifying why the value is invalid, if | |
| 1265 that's not self-evident.) | |
| 1266 -- the file in which an error occurred. (In such cases, there should be a | |
| 1267 second frob, probably a string, specifying the exact error that occurred. | |
| 1268 This does not occur in the string that precedes the first frob, because | |
| 1269 that frob describes the exact operation that was happening. | |
| 1270 | |
| 1271 For historical compatibility, DATUM can also be a string. In this case, | |
| 1272 DATUM and ARGS are passed together as the arguments to `format', and then | |
| 1273 an error is signalled using the error symbol `error' and formatted string. | |
| 1274 Although this usage of `error' is very common, it is deprecated because it | |
| 1275 totally defeats the purpose of having structured errors. There is now | |
| 1276 a rich set of defined errors you can use: | |
| 1277 | |
| 563 | 1278 quit |
| 1279 | |
| 442 | 1280 error |
| 1281 invalid-argument | |
| 563 | 1282 syntax-error |
| 1283 invalid-read-syntax | |
| 1284 invalid-regexp | |
| 1285 structure-formation-error | |
| 1286 list-formation-error | |
| 1287 malformed-list | |
| 1288 malformed-property-list | |
| 1289 circular-list | |
| 1290 circular-property-list | |
| 1291 invalid-function | |
| 1292 no-catch | |
| 1293 undefined-keystroke-sequence | |
| 1294 invalid-constant | |
| 442 | 1295 wrong-type-argument |
| 1296 args-out-of-range | |
| 1297 wrong-number-of-arguments | |
| 428 | 1298 |
| 442 | 1299 invalid-state |
| 1300 void-function | |
| 1301 cyclic-function-indirection | |
| 1302 void-variable | |
| 1303 cyclic-variable-indirection | |
| 509 | 1304 invalid-byte-code |
| 563 | 1305 stack-overflow |
| 1306 out-of-memory | |
| 1307 invalid-key-binding | |
| 1308 internal-error | |
| 442 | 1309 |
| 1310 invalid-operation | |
| 1311 invalid-change | |
| 1312 setting-constant | |
| 563 | 1313 protected-field |
| 442 | 1314 editing-error |
| 1315 beginning-of-buffer | |
| 1316 end-of-buffer | |
| 1317 buffer-read-only | |
| 1318 io-error | |
| 509 | 1319 file-error |
| 1320 file-already-exists | |
| 1321 file-locked | |
| 1322 file-supersession | |
| 563 | 1323 end-of-file |
| 1324 process-error | |
| 1325 network-error | |
| 509 | 1326 tooltalk-error |
| 563 | 1327 gui-error |
| 1328 dialog-box-error | |
| 1329 sound-error | |
| 1330 conversion-error | |
| 1331 text-conversion-error | |
| 1332 image-conversion-error | |
| 1333 base64-conversion-error | |
| 1334 selection-conversion-error | |
| 442 | 1335 arith-error |
| 1336 range-error | |
| 1337 domain-error | |
| 1338 singularity-error | |
| 1339 overflow-error | |
| 1340 underflow-error | |
| 509 | 1341 search-failed |
| 563 | 1342 printing-unreadable-object |
| 1343 unimplemented | |
| 509 | 1344 |
| 563 | 1345 Note the semantic differences between some of the more common errors: |
| 442 | 1346 |
| 563 | 1347 -- `invalid-argument' is for all cases where a bad value is encountered. |
| 1348 -- `invalid-constant' is for arguments where only a specific set of values | |
| 1349 is allowed. | |
| 1350 -- `syntax-error' is when complex structures (parsed strings, lists, | |
| 1351 and the like) are badly formed. If the problem is just a single bad | |
| 1352 value inside the structure, you should probably be using something else, | |
| 1353 e.g. `invalid-constant', `wrong-type-argument', or `invalid-argument'. | |
| 442 | 1354 -- `invalid-state' means that some settings have been changed in such a way |
| 1355 that their current state is unallowable. More and more, code is being | |
| 1356 written more carefully, and catches the error when the settings are being | |
| 1357 changed, rather than afterwards. This leads us to the next error: | |
| 1358 -- `invalid-change' means that an attempt is being made to change some settings | |
| 1359 into an invalid state. `invalid-change' is a type of `invalid-operation'. | |
| 1360 -- `invalid-operation' refers to all cases where code is trying to do something | |
| 563 | 1361 that's disallowed, or when an error occurred during an operation. (These |
| 1362 two concepts are merged because there's no clear distinction between them.) | |
| 1363 -- `io-error' refers to errors involving interaction with any external | |
| 1364 components (files, other programs, the operating system, etc). | |
| 442 | 1365 |
| 1366 See also `cerror', `signal', and `signal-error'." | |
| 1367 (while t (apply | |
| 1368 'cerror datum args))) | |
| 1369 | |
| 1370 (defun cerror (datum &rest args) | |
| 428 | 1371 "Like `error' but signals a continuable error." |
| 442 | 1372 (cond ((stringp datum) |
| 1373 (signal 'error (list (apply 'format datum args)))) | |
| 1374 ((defined-error-p datum) | |
| 1375 (signal datum args)) | |
| 1376 (t | |
| 1377 (error 'invalid-argument "datum not string or error symbol" datum)))) | |
| 428 | 1378 |
| 1379 (defmacro check-argument-type (predicate argument) | |
| 1380 "Check that ARGUMENT satisfies PREDICATE. | |
| 442 | 1381 This is a macro, and ARGUMENT is not evaluated. If ARGUMENT is an lvalue, |
| 1382 this function signals a continuable `wrong-type-argument' error until the | |
| 1383 returned value satisfies PREDICATE, and assigns the returned value | |
| 1384 to ARGUMENT. Otherwise, this function signals a non-continuable | |
| 1385 `wrong-type-argument' error if the returned value does not satisfy PREDICATE." | |
| 1386 (if (symbolp argument) | |
| 1387 `(if (not (,(eval predicate) ,argument)) | |
| 1388 (setq ,argument | |
| 1389 (wrong-type-argument ,predicate ,argument))) | |
| 1390 `(if (not (,(eval predicate) ,argument)) | |
| 1391 (signal-error 'wrong-type-argument (list ,predicate ,argument))))) | |
| 428 | 1392 |
| 872 | 1393 (defun args-out-of-range (value min max) |
| 1394 "Signal an error until the correct in-range value is given by the user. | |
| 1395 This function loops, signalling a continuable `args-out-of-range' error | |
| 1396 with VALUE, MIN and MAX as the data associated with the error and then | |
| 1397 checking the returned value to make sure it's not outside the given | |
| 1398 boundaries \(nil for either means no boundary on that side). At that | |
| 1399 point, the gotten value is returned." | |
| 1400 (loop | |
| 1401 for newval = (signal 'args-out-of-range (list value min max)) | |
| 1402 do (setq value newval) | |
| 1403 finally return value | |
| 1404 while (not (argument-in-range-p value min max)))) | |
| 1405 | |
| 1406 (defun argument-in-range-p (argument min max) | |
| 1407 "Return true if ARGUMENT is within the range of [MIN, MAX]. | |
| 1408 This includes boundaries. nil for either value means no limit on that side." | |
| 1409 (and (or (not min) (<= min argument)) | |
| 1410 (or (not max) (<= argument max)))) | |
| 1411 | |
| 1412 (defmacro check-argument-range (argument min max) | |
| 1413 "Check that ARGUMENT is within the range [MIN, MAX]. | |
| 1414 This is a macro, and ARGUMENT is not evaluated. If ARGUMENT is an lvalue, | |
| 1415 this function signals a continuable `args-out-of-range' error until the | |
| 1416 returned value is within range, and assigns the returned value | |
| 1417 to ARGUMENT. Otherwise, this function signals a non-continuable | |
| 1418 `args-out-of-range' error if the returned value is out of range." | |
| 1419 (if (symbolp argument) | |
| 1420 `(if (not (argument-in-range-p ,argument ,min ,max)) | |
| 924 | 1421 (setq ,argument |
| 1422 (args-out-of-range ,argument ,min ,max))) | |
| 872 | 1423 (let ((newsym (gensym))) |
| 1424 `(let ((,newsym ,argument)) | |
| 924 | 1425 (if (not (argument-in-range-p ,newsym ,min ,max)) |
| 4103 | 1426 (signal-error 'args-out-of-range (list ,newsym ,min ,max))))))) |
| 872 | 1427 |
| 428 | 1428 (defun signal-error (error-symbol data) |
| 1429 "Signal a non-continuable error. Args are ERROR-SYMBOL, and associated DATA. | |
| 1430 An error symbol is a symbol defined using `define-error'. | |
| 1431 DATA should be a list. Its elements are printed as part of the error message. | |
| 1432 If the signal is handled, DATA is made available to the handler. | |
| 1433 See also `signal', and the functions to handle errors: `condition-case' | |
| 1434 and `call-with-condition-handler'." | |
| 1435 (while t | |
| 1436 (signal error-symbol data))) | |
| 1437 | |
| 1438 (defun define-error (error-sym doc-string &optional inherits-from) | |
| 1439 "Define a new error, denoted by ERROR-SYM. | |
| 1440 DOC-STRING is an informative message explaining the error, and will be | |
| 1441 printed out when an unhandled error occurs. | |
| 1442 ERROR-SYM is a sub-error of INHERITS-FROM (which defaults to `error'). | |
| 1443 | |
| 1444 \[`define-error' internally works by putting on ERROR-SYM an `error-message' | |
| 1445 property whose value is DOC-STRING, and an `error-conditions' property | |
| 1446 that is a list of ERROR-SYM followed by each of its super-errors, up | |
| 1447 to and including `error'. You will sometimes see code that sets this up | |
| 1448 directly rather than calling `define-error', but you should *not* do this | |
| 1449 yourself.]" | |
| 1450 (check-argument-type 'symbolp error-sym) | |
| 1451 (check-argument-type 'stringp doc-string) | |
| 1452 (put error-sym 'error-message doc-string) | |
| 1453 (or inherits-from (setq inherits-from 'error)) | |
| 1454 (let ((conds (get inherits-from 'error-conditions))) | |
| 1455 (or conds (signal-error 'error (list "Not an error symbol" error-sym))) | |
| 1456 (put error-sym 'error-conditions (cons error-sym conds)))) | |
| 1457 | |
| 442 | 1458 (defun defined-error-p (sym) |
| 1459 "Returns non-nil if SYM names a currently-defined error." | |
| 1460 (and (symbolp sym) (not (null (get sym 'error-conditions))))) | |
| 1461 | |
| 793 | 1462 (defun backtrace-in-condition-handler-eliminating-handler (handler-arg-name) |
| 1463 "Return a backtrace inside of a condition handler, eliminating the handler. | |
| 1464 This is for use in the condition handler inside of call-with-condition-handler, | |
| 1465 when written like this: | |
| 1466 | |
| 1467 \(call-with-condition-handler | |
| 1468 #'(lambda (__some_weird_arg__) | |
| 1469 do the handling ...) | |
| 1470 #'(lambda () | |
| 1471 do the stuff that might cause an error)) | |
| 1472 | |
| 1473 Pass in the name (a symbol) of the argument used in the lambda function | |
| 1474 that specifies the handler, and make sure the argument name is unique, and | |
| 1475 this function generates a backtrace and strips off the part above where the | |
| 1476 error occurred (i.e. the handler itself)." | |
| 1477 (let* ((bt (with-output-to-string (backtrace nil t))) | |
| 1478 (bt (save-match-data | |
| 1479 ;; Try to eliminate the part of the backtrace | |
| 1480 ;; above where the error occurred. | |
| 1481 (if (string-match | |
| 1482 (concat "bind (\\(?:.* \\)?" (symbol-name handler-arg-name) | |
| 1483 "\\(?:.* \\)?)[ \t\n]*\\(?:(lambda \\|#<compiled-function \\)(" | |
| 1484 (symbol-name handler-arg-name) | |
| 1485 ").*\n\\(\\(?:.\\|\n\\)*\\)$") | |
| 1486 bt) (match-string 1 bt) bt)))) | |
| 1487 bt)) | |
| 1488 | |
| 1489 (put 'with-trapping-errors 'lisp-indent-function 0) | |
| 1490 (defmacro with-trapping-errors (&rest keys-body) | |
| 1491 "Trap errors in BODY, outputting a warning and a backtrace. | |
| 1492 Usage looks like | |
| 1493 | |
| 1494 \(with-trapping-errors | |
| 1495 [:operation OPERATION] | |
| 1496 [:error-form ERROR-FORM] | |
| 1497 [:no-backtrace NO-BACKTRACE] | |
| 1498 [:class CLASS] | |
| 1499 [:level LEVEL] | |
| 1500 [:resignal RESIGNAL] | |
| 1501 BODY) | |
| 1502 | |
| 1503 Return value without error is whatever BODY returns. With error, return | |
| 1504 result of ERROR-FORM (which will be evaluated only when the error actually | |
| 1505 occurs), which defaults to nil. OPERATION is given in the warning message. | |
| 1506 CLASS and LEVEL are the warning class and level (default to class | |
| 1507 `general', level `warning'). If NO-BACKTRACE is given, no backtrace is | |
| 1508 displayed. If RESIGNAL is given, the error is resignaled after the warning | |
| 1509 is displayed and the ERROR-FORM is executed." | |
| 1510 (let ((operation "unknown") | |
| 1511 (error-form nil) | |
| 1512 (no-backtrace nil) | |
| 1513 (class ''general) | |
| 1514 (level ''warning) | |
|
4806
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1515 (resignal nil) |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1516 (cte-cc-var '#:cte-cc-var) |
|
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1517 (call-trapping-errors-arg '#:call-trapping-errors-Ldc9FC5Hr)) |
| 793 | 1518 (let* ((keys '(operation error-form no-backtrace class level resignal)) |
| 1519 (keys-with-colon | |
| 1520 (mapcar #'(lambda (sym) | |
| 1521 (intern (concat ":" (symbol-name sym)))) keys))) | |
| 1522 (while (memq (car keys-body) keys-with-colon) | |
| 1523 (let* ((key-with-colon (pop keys-body)) | |
| 1524 (key (intern (substring (symbol-name key-with-colon) 1)))) | |
| 1525 (set key (pop keys-body))))) | |
|
4806
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1526 `(condition-case ,(if resignal cte-cc-var nil) |
| 793 | 1527 (call-with-condition-handler |
|
4806
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1528 #'(lambda (,call-trapping-errors-arg) |
| 793 | 1529 (let ((errstr (error-message-string |
|
4806
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1530 ,call-trapping-errors-arg))) |
| 793 | 1531 ,(if no-backtrace |
| 1532 `(lwarn ,class ,level | |
| 1533 (if (warning-level-< | |
| 1534 ,level | |
| 1535 display-warning-minimum-level) | |
| 1536 "Error in %s: %s" | |
| 1537 "Error in %s:\n%s\n") | |
| 1538 ,operation errstr) | |
| 1539 `(lwarn ,class ,level | |
| 1540 "Error in %s: %s\n\nBacktrace follows:\n\n%s" | |
| 1541 ,operation errstr | |
| 1542 (backtrace-in-condition-handler-eliminating-handler | |
|
4806
fd36a980d701
Use uninterned symbols in various information-hiding contexts.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4575
diff
changeset
|
1543 ',call-trapping-errors-arg))))) |
| 793 | 1544 #'(lambda () |
| 1545 (progn ,@keys-body))) | |
| 1546 (error | |
| 1547 ,error-form | |
|
4817
0142cb4d1049
Fix a bug I introduced in #'with-trapping-errors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4806
diff
changeset
|
1548 ,@(if resignal `((signal (car ,cte-cc-var) (cdr ,cte-cc-var))))) |
| 793 | 1549 ))) |
| 1550 | |
| 428 | 1551 ;;;; Miscellanea. |
| 1552 | |
| 1553 ;; This is now in C. | |
| 444 | 1554 ;(defun buffer-substring-no-properties (start end) |
| 1555 ; "Return the text from START to END, without text properties, as a string." | |
| 1556 ; (let ((string (buffer-substring start end))) | |
| 428 | 1557 ; (set-text-properties 0 (length string) nil string) |
| 1558 ; string)) | |
| 1559 | |
| 1560 (defun get-buffer-window-list (&optional buffer minibuf frame) | |
| 1561 "Return windows currently displaying BUFFER, or nil if none. | |
| 1562 BUFFER defaults to the current buffer. | |
| 1563 See `walk-windows' for the meaning of MINIBUF and FRAME." | |
| 1564 (cond ((null buffer) | |
| 1565 (setq buffer (current-buffer))) | |
| 1566 ((not (bufferp buffer)) | |
| 1567 (setq buffer (get-buffer buffer)))) | |
| 1568 (let (windows) | |
| 1569 (walk-windows (lambda (window) | |
| 1570 (if (eq (window-buffer window) buffer) | |
| 1571 (push window windows))) | |
| 1572 minibuf frame) | |
| 1573 windows)) | |
| 1574 | |
| 1575 (defun ignore (&rest ignore) | |
| 1576 "Do nothing and return nil. | |
| 1577 This function accepts any number of arguments, but ignores them." | |
| 1578 (interactive) | |
| 1579 nil) | |
| 1580 | |
| 883 | 1581 ;; defined in lisp/bindings.el in GNU Emacs. |
| 1582 (defmacro bound-and-true-p (var) | |
| 1583 "Return the value of symbol VAR if it is bound, else nil." | |
| 1584 `(and (boundp (quote ,var)) ,var)) | |
| 1585 | |
| 1586 ;; `propertize' is a builtin in GNU Emacs 21. | |
| 1587 (defun propertize (string &rest properties) | |
| 1588 "Return a copy of STRING with text properties added. | |
| 1589 First argument is the string to copy. | |
| 1590 Remaining arguments form a sequence of PROPERTY VALUE pairs for text | |
| 1591 properties to add to the result." | |
| 1592 (let ((str (copy-sequence string))) | |
| 1593 (add-text-properties 0 (length str) | |
| 1594 properties | |
| 1595 str) | |
| 1596 str)) | |
| 1597 | |
| 1598 ;; `delete-and-extract-region' is a builtin in GNU Emacs 21. | |
| 1599 (defun delete-and-extract-region (start end) | |
| 1600 "Delete the text between START and END and return it." | |
| 1601 (let ((region (buffer-substring start end))) | |
| 1602 (delete-region start end) | |
| 1603 region)) | |
| 1604 | |
| 428 | 1605 (define-function 'eval-in-buffer 'with-current-buffer) |
| 1606 (make-obsolete 'eval-in-buffer 'with-current-buffer) | |
| 1607 | |
| 1608 ;;; `functionp' has been moved into C. | |
| 1609 | |
| 1610 ;;(defun functionp (object) | |
| 1611 ;; "Non-nil if OBJECT can be called as a function." | |
| 1612 ;; (or (and (symbolp object) (fboundp object)) | |
| 1613 ;; (subrp object) | |
| 1614 ;; (compiled-function-p object) | |
| 1615 ;; (eq (car-safe object) 'lambda))) | |
| 1616 | |
| 1617 (defun function-interactive (function) | |
| 1618 "Return the interactive specification of FUNCTION. | |
| 1619 FUNCTION can be any funcallable object. | |
| 1620 The specification will be returned as the list of the symbol `interactive' | |
| 1621 and the specs. | |
| 1622 If FUNCTION is not interactive, nil will be returned." | |
| 1623 (setq function (indirect-function function)) | |
| 1624 (cond ((compiled-function-p function) | |
| 1625 (compiled-function-interactive function)) | |
| 1626 ((subrp function) | |
| 1627 (subr-interactive function)) | |
| 1628 ((eq (car-safe function) 'lambda) | |
| 1629 (let ((spec (if (stringp (nth 2 function)) | |
| 1630 (nth 3 function) | |
| 1631 (nth 2 function)))) | |
| 1632 (and (eq (car-safe spec) 'interactive) | |
| 1633 spec))) | |
| 1634 (t | |
| 1635 (error "Non-funcallable object: %s" function)))) | |
| 1636 | |
| 442 | 1637 (defun function-allows-args (function n) |
| 1638 "Return whether FUNCTION can be called with N arguments." | |
| 1639 (and (<= (function-min-args function) n) | |
| 1640 (or (null (function-max-args function)) | |
| 1641 (<= n (function-max-args function))))) | |
| 1642 | |
| 428 | 1643 ;; This function used to be an alias to `buffer-substring', except |
| 1644 ;; that FSF Emacs 20.4 added a BUFFER argument in an incompatible way. | |
| 1645 ;; The new FSF's semantics makes more sense, but we try to support | |
| 1646 ;; both for backward compatibility. | |
| 1647 (defun buffer-string (&optional buffer old-end old-buffer) | |
| 1648 "Return the contents of the current buffer as a string. | |
| 1649 If narrowing is in effect, this function returns only the visible part | |
| 1650 of the buffer. | |
| 1651 | |
| 1652 If BUFFER is specified, the contents of that buffer are returned. | |
| 1653 | |
| 1654 The arguments OLD-END and OLD-BUFFER are supported for backward | |
| 1655 compatibility with pre-21.2 XEmacsen times when arguments to this | |
| 1656 function were (buffer-string &optional START END BUFFER)." | |
| 1657 (cond | |
| 1658 ((or (stringp buffer) (bufferp buffer)) | |
| 1659 ;; Most definitely the new way. | |
| 1660 (buffer-substring nil nil buffer)) | |
| 1661 ((or (stringp old-buffer) (bufferp old-buffer) | |
| 1662 (natnump buffer) (natnump old-end)) | |
| 1663 ;; Definitely the old way. | |
| 1664 (buffer-substring buffer old-end old-buffer)) | |
| 1665 (t | |
| 1666 ;; Probably the old way. | |
| 1667 (buffer-substring buffer old-end old-buffer)))) | |
| 1668 | |
| 1333 | 1669 ;; BEGIN SYNC WITH FSF 21.2 |
| 1670 | |
| 428 | 1671 ;; This was not present before. I think Jamie had some objections |
| 1672 ;; to this, so I'm leaving this undefined for now. --ben | |
| 1673 | |
| 1674 ;;; The objection is this: there is more than one way to load the same file. | |
| 1675 ;;; "foo", "foo.elc", "foo.el", and "/some/path/foo.elc" are all different | |
| 1676 ;;; ways to load the exact same code. `eval-after-load' is too stupid to | |
| 1677 ;;; deal with this sort of thing. If this sort of feature is desired, then | |
| 1678 ;;; it should work off of a hook on `provide'. Features are unique and | |
| 1679 ;;; the arguments to (load) are not. --Stig | |
| 1680 | |
| 1681 ;; We provide this for FSFmacs compatibility, at least until we devise | |
| 1682 ;; something better. | |
| 1683 | |
| 1684 ;;;; Specifying things to do after certain files are loaded. | |
| 1685 | |
| 1686 (defun eval-after-load (file form) | |
| 1687 "Arrange that, if FILE is ever loaded, FORM will be run at that time. | |
| 1688 This makes or adds to an entry on `after-load-alist'. | |
| 1689 If FILE is already loaded, evaluate FORM right now. | |
| 1690 It does nothing if FORM is already on the list for FILE. | |
| 1333 | 1691 FILE must match exactly. Normally FILE is the name of a library, |
| 1692 with no directory or extension specified, since that is how `load' | |
| 1693 is normally called." | |
| 1694 ;; Make sure `load-history' contains the files dumped with Emacs | |
| 1695 ;; for the case that FILE is one of the files dumped with Emacs. | |
| 1696 (if-fboundp 'load-symbol-file-load-history | |
| 1697 (load-symbol-file-load-history)) | |
| 428 | 1698 ;; Make sure there is an element for FILE. |
| 1699 (or (assoc file after-load-alist) | |
| 1700 (setq after-load-alist (cons (list file) after-load-alist))) | |
| 1701 ;; Add FORM to the element if it isn't there. | |
| 1702 (let ((elt (assoc file after-load-alist))) | |
| 1703 (or (member form (cdr elt)) | |
| 1704 (progn | |
| 1705 (nconc elt (list form)) | |
| 1706 ;; If the file has been loaded already, run FORM right away. | |
| 1707 (and (assoc file load-history) | |
| 1708 (eval form))))) | |
| 1709 form) | |
| 1710 (make-compatible 'eval-after-load "") | |
| 1711 | |
| 1712 (defun eval-next-after-load (file) | |
| 1713 "Read the following input sexp, and run it whenever FILE is loaded. | |
| 1714 This makes or adds to an entry on `after-load-alist'. | |
| 1715 FILE should be the name of a library, with no directory name." | |
| 1716 (eval-after-load file (read))) | |
| 1717 (make-compatible 'eval-next-after-load "") | |
| 1718 | |
| 1333 | 1719 ;; END SYNC WITH FSF 21.2 |
| 428 | 1720 |
| 3000 | 1721 ;; BEGIN SYNC WITH FSF 22.0.50.1 (CVS) |
| 1722 (defun delete-dups (list) | |
| 1723 "Destructively remove `equal' duplicates from LIST. | |
| 1724 Store the result in LIST and return it. LIST must be a proper list. | |
| 1725 Of several `equal' occurrences of an element in LIST, the first | |
| 1726 one is kept." | |
|
5522
544e6336d37c
Reimplement a few GNU functions in terms of CL functions, subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
1727 (delete-duplicates (the list list) :test 'equal :from-end t)) |
| 3000 | 1728 |
| 1729 ;; END SYNC WITH FSF 22.0.50.1 (CVS) | |
| 1730 | |
| 2525 | 1731 ;; (defun shell-quote-argument (argument) in process.el. |
| 1732 | |
| 1733 ;; (defun make-syntax-table (&optional oldtable) in syntax.el. | |
| 1734 | |
|
4575
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1735 ;; (defun syntax-after (pos) in syntax.el. |
| 2525 | 1736 |
| 1737 ;; global-set-key, local-set-key, global-unset-key, local-unset-key in | |
| 1738 ;; keymap.el. | |
| 1739 | |
| 1740 ;; frame-configuration-p is in frame.el. | |
| 1741 | |
| 1742 ;; functionp is built-in. | |
| 1743 | |
| 1744 ;; interactive-form in obsolete.el. | |
| 1745 | |
| 1746 ;; assq-del-all in obsolete.el. | |
| 1747 | |
| 4266 | 1748 ;; make-temp-file in files.el. |
| 2525 | 1749 |
| 1750 ;; add-minor-mode in modeline.el. | |
| 1751 | |
| 1752 ;; text-clone stuff #### doesn't exist; should go in text-props.el and | |
| 1753 ;; requires changes to extents.c (modification hooks). | |
| 1754 | |
| 1755 ;; play-sound is built-in. | |
| 1756 | |
| 1757 ;; define-mail-user-agent is in simple.el. | |
| 1758 | |
|
4501
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1759 ;; XEmacs; added. |
|
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1760 (defun skip-chars-quote (string) |
|
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1761 "Return a string that means all characters in STRING will be skipped, |
|
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1762 if passed to `skip-chars-forward' or `skip-chars-backward'. |
|
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1763 |
|
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1764 Ranges and carets are not treated specially. This implementation is |
|
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1765 in Lisp; do not use it in performance-critical code." |
|
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1766 (let ((list (delete-duplicates (string-to-list string) :test #'=))) |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5338
diff
changeset
|
1767 (when (not (eql 1 (length list))) ;; No quoting needed in a string of |
|
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5338
diff
changeset
|
1768 ;; length 1. |
|
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5338
diff
changeset
|
1769 (when (eql ?^ (car list)) |
|
4504
b82fdf7305ee
Correct the implementation, add a few basic tests for #'skip-chars-quote.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4501
diff
changeset
|
1770 (setq list (nconc (cdr list) '(?^)))) |
|
b82fdf7305ee
Correct the implementation, add a few basic tests for #'skip-chars-quote.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4501
diff
changeset
|
1771 (when (memq ?\\ list) |
|
b82fdf7305ee
Correct the implementation, add a few basic tests for #'skip-chars-quote.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4501
diff
changeset
|
1772 (setq list (delq ?\\ list) |
|
b82fdf7305ee
Correct the implementation, add a few basic tests for #'skip-chars-quote.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4501
diff
changeset
|
1773 list (nconc (list ?\\ ?\\) list))) |
|
b82fdf7305ee
Correct the implementation, add a few basic tests for #'skip-chars-quote.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4501
diff
changeset
|
1774 (when (memq ?- list) |
|
b82fdf7305ee
Correct the implementation, add a few basic tests for #'skip-chars-quote.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4501
diff
changeset
|
1775 (setq list (delq ?- list) |
|
b82fdf7305ee
Correct the implementation, add a few basic tests for #'skip-chars-quote.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4501
diff
changeset
|
1776 list (nconc list '(?\\ ?-))))) |
|
4501
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1777 (apply #'string list))) |
|
c4fd85dd95bd
Add #'skip-chars-quote to subr.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
4463
diff
changeset
|
1778 |
|
4575
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1779 ;; XEmacs addition to subr.el; docstring and API taken initially from GNU's |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1780 ;; data.c, revision 1.275, GPLv2. |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1781 (defun subr-arity (subr) |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1782 "Return minimum and maximum number of args allowed for SUBR. |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1783 SUBR must be a built-in function (not just a symbol that refers to one). |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1784 The returned value is a pair (MIN . MAX). MIN is the minimum number |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1785 of args. MAX is the maximum number or the symbol `many', for a |
|
4905
755ae5b97edb
Change "special form" to "special operator" in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4817
diff
changeset
|
1786 function with `&rest' args, or `unevalled' for a special operator. |
|
4575
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1787 |
|
4905
755ae5b97edb
Change "special form" to "special operator" in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4817
diff
changeset
|
1788 See also `special-operator-p', `subr-min-args', `subr-max-args', |
|
4575
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1789 `function-allows-args'. " |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1790 (check-argument-type #'subrp subr) |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1791 (cons (subr-min-args subr) |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1792 (cond |
|
4905
755ae5b97edb
Change "special form" to "special operator" in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4817
diff
changeset
|
1793 ((special-operator-p subr) |
|
4575
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1794 'unevalled) |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1795 ((null (subr-max-args subr)) |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1796 'many) |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1797 (t (subr-max-args subr))))) |
|
eecd28508f4a
Add #'subr-arity, API taken from GNU, implementation our own.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4516
diff
changeset
|
1798 |
|
5004
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1799 ;; XEmacs; move these here from C. Would be nice to drop them entirely, but |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1800 ;; they're used reasonably often, since they've been around for a long time |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1801 ;; and they're portable to GNU. |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1802 |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
1803 ;; No longer used in C, now list_merge() accepts a KEY argument. |
|
5004
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1804 (defun car-less-than-car (a b) |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1805 "Return t if the car of A is numerically less than the car of B." |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1806 (< (car a) (car b))) |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1807 |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1808 ;; Used in packages. |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1809 (defun cdr-less-than-cdr (a b) |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1810 "Return t if (cdr A) is numerically less than (cdr B)." |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1811 (< (cdr a) (cdr b))) |
|
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4905
diff
changeset
|
1812 |
|
5220
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1813 ;; XEmacs; this is in editfns.c in GNU. |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1814 (defun float-time (&optional specified-time) |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1815 "Convert time value SPECIFIED-TIME to a floating point number. |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1816 |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1817 See `current-time'. Since the result is a floating-point number, this may |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1818 not have the same accuracy as does the result of `current-time'. |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1819 |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1820 If not supplied, SPECIFIED-TIME defaults to the result of `current-time'." |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1821 (or specified-time (setq specified-time (current-time))) |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1822 (+ (* (pop specified-time) (+ #x10000 0.0)) |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1823 (if (consp specified-time) |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1824 (pop specified-time) |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1825 (prog1 |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1826 specified-time |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1827 (setq specified-time nil))) |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1828 (or (and specified-time |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1829 (/ (car specified-time) 1000000.0)) |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1830 0.0))) |
|
2157ecaedc1d
Add `float-time', implemented in Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
1831 |
| 428 | 1832 ;;; subr.el ends here |