2013-06-05 01:58:43 +00:00
|
|
|
|
;;; subr.el --- basic lisp subroutines for Emacs -*- coding: utf-8; lexical-binding:t -*-
|
1992-07-15 21:31:44 +00:00
|
|
|
|
|
2014-01-01 07:43:34 +00:00
|
|
|
|
;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2014 Free Software
|
2013-01-01 09:11:05 +00:00
|
|
|
|
;; Foundation, Inc.
|
1990-11-05 10:06:02 +00:00
|
|
|
|
|
2014-02-10 01:34:22 +00:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
2002-05-02 05:41:46 +00:00
|
|
|
|
;; Keywords: internal
|
2010-08-29 16:17:13 +00:00
|
|
|
|
;; Package: emacs
|
2002-05-02 05:41:46 +00:00
|
|
|
|
|
1990-11-05 10:06:02 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1990-11-05 10:06:02 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1990-11-05 10:06:02 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1990-11-05 10:06:02 +00:00
|
|
|
|
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
1992-07-15 21:31:44 +00:00
|
|
|
|
;;; Code:
|
2008-10-20 09:40:23 +00:00
|
|
|
|
|
Provide generalized variables in core Elisp.
* lisp/emacs-lisp/gv.el: New file.
* lisp/subr.el (push, pop): Extend to generalized variables.
* lisp/loadup.el (macroexp): Unload if preloaded and uncompiled.
* lisp/emacs-lisp/cl-lib.el (cl-pop, cl-push, cl--set-nthcdr): Remove.
* lisp/emacs-lisp/cl-macs.el: Require gv. Use gv-define-setter,
gv-define-simple-setter, and gv-define-expander.
Remove setf-methods defined in gv. Rename cl-setf -> setf.
(cl-setf, cl-do-pop, cl-get-setf-method): Remove.
(cl-letf, cl-letf*, cl-define-modify-macro, cl-defsetf)
(cl-define-setf-expander, cl-struct-setf-expander): Move to cl.el.
(cl-remf, cl-shiftf, cl-rotatef, cl-callf, cl-callf2): Rewrite with
gv-letplace.
(cl-defstruct): Don't define setf-method any more.
* lisp/emacs-lisp/cl.el (flet): Don't autoload.
(cl--letf, letf, cl--letf*, letf*, cl--gv-adapt)
(define-setf-expander, defsetf, define-modify-macro)
(cl-struct-setf-expander): Move from cl-lib.el.
* lisp/emacs-lisp/syntax.el:
* lisp/emacs-lisp/ewoc.el:
* lisp/emacs-lisp/smie.el:
* lisp/emacs-lisp/cconv.el:
* lisp/emacs-lisp/timer.el: Rename cl-setf -> setf, cl-push -> push.
(timer--time): Use gv-define-simple-setter.
* lisp/emacs-lisp/macroexp.el (macroexp-let2): Rename from macroexp-let²
to avoid coding-system problems in subr.el. Adjust all users.
(macroexp--maxsize, macroexp-small-p): New functions.
* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Don't use cl-letf.
* lisp/scroll-bar.el (scroll-bar-mode):
* lisp/simple.el (auto-fill-mode, overwrite-mode, binary-overwrite-mode)
(normal-erase-is-backspace-mode): Don't use the `eq' place.
* lisp/winner.el (winner-configuration, winner-make-point-alist)
(winner-set-conf, winner-get-point, winner-set): Don't abuse letf.
* lisp/files.el (locate-file-completion-table): Avoid list*.
Fixes: debbugs:11657
2012-06-22 13:42:38 +00:00
|
|
|
|
;; Beware: while this file has tag `utf-8', before it's compiled, it gets
|
|
|
|
|
;; loaded as "raw-text", so non-ASCII chars won't work right during bootstrap.
|
|
|
|
|
|
2013-06-05 01:58:43 +00:00
|
|
|
|
(defmacro declare-function (_fn _file &optional _arglist _fileonly)
|
2007-12-03 00:33:35 +00:00
|
|
|
|
"Tell the byte-compiler that function FN is defined, in FILE.
|
2013-06-11 16:51:12 +00:00
|
|
|
|
Optional ARGLIST is the argument list used by the function.
|
|
|
|
|
The FILE argument is not used by the byte-compiler, but by the
|
2007-12-03 00:33:35 +00:00
|
|
|
|
`check-declare' package, which checks that FILE contains a
|
2013-06-11 16:51:12 +00:00
|
|
|
|
definition for FN. ARGLIST is used by both the byte-compiler
|
|
|
|
|
and `check-declare' to check for consistency.
|
2007-12-03 00:33:35 +00:00
|
|
|
|
|
|
|
|
|
FILE can be either a Lisp file (in which case the \".el\"
|
|
|
|
|
extension is optional), or a C file. C files are expanded
|
|
|
|
|
relative to the Emacs \"src/\" directory. Lisp files are
|
|
|
|
|
searched for using `locate-library', and if that fails they are
|
|
|
|
|
expanded relative to the location of the file containing the
|
|
|
|
|
declaration. A FILE with an \"ext:\" prefix is an external file.
|
|
|
|
|
`check-declare' will check such files if they are found, and skip
|
|
|
|
|
them without error if they are not.
|
|
|
|
|
|
|
|
|
|
FILEONLY non-nil means that `check-declare' will only check that
|
|
|
|
|
FILE exists, not that it defines FN. This is intended for
|
|
|
|
|
function-definitions that `check-declare' does not recognize, e.g.
|
|
|
|
|
`defstruct'.
|
|
|
|
|
|
|
|
|
|
To specify a value for FILEONLY without passing an argument list,
|
2011-01-11 03:23:04 +00:00
|
|
|
|
set ARGLIST to t. This is necessary because nil means an
|
2007-12-03 00:33:35 +00:00
|
|
|
|
empty argument list, rather than an unspecified one.
|
|
|
|
|
|
|
|
|
|
Note that for the purposes of `check-declare', this statement
|
2009-10-01 02:03:38 +00:00
|
|
|
|
must be the first non-whitespace on a line.
|
2007-12-03 00:33:35 +00:00
|
|
|
|
|
2008-12-13 04:12:45 +00:00
|
|
|
|
For more information, see Info node `(elisp)Declaring Functions'."
|
2007-12-03 00:33:35 +00:00
|
|
|
|
;; Does nothing - byte-compile-declare-function does the work.
|
|
|
|
|
nil)
|
2008-10-20 16:14:06 +00:00
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Basic Lisp macros.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2001-11-08 00:57:57 +00:00
|
|
|
|
(defalias 'not 'null)
|
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(defmacro noreturn (form)
|
2005-12-30 02:59:47 +00:00
|
|
|
|
"Evaluate FORM, expecting it not to return.
|
|
|
|
|
If FORM does return, signal an error."
|
* lisp/emacs-lisp/edebug.el: Miscellaneous cleanup.
Remove obsolete byte-compiler hack that tried to silence some warnings.
(edebug-submit-bug-report): Remove.
(edebug-get-buffer-window, edebug-sit-for, edebug-input-pending-p):
Remove aliases, use the un-prefixed name instead.
(edebug-pop-to-buffer): Consider other frames.
(edebug-original-read):: Make it more obvious that it's always defined.
(edebug--make-form-data-entry, edebug--form-data-name)
(edebug--form-data-begin, edebug--form-data-end): Rename from the
single-dashed name, and implement with cl-defstruct.
(edebug-set-form-data-entry): Use the standard accessors.
(edebug-make-top-form-data-entry): Use push.
(edebug-no-match): Drop useless `funcall'.
(mapcar, mapconcat, mapatoms, apply, funcall): Don't add debug specs
to functions.
(defsubst, dont-compile, eval-when-compile, eval-and-compile)
(delay-mode-hooks, with-temp-file, with-temp-message, ad-dolist)
(with-syntax-table, push, pop, 1value, noreturn, defadvice)
(easy-menu-define, with-custom-print): Remove redundant specs.
(edebug-outside-overriding-local-map)
(edebug-outside-overriding-terminal-local-map): Remove, unused.
(edebug--display): Bind unread-command-events directly to nil rather
than binding it to unread-command-events and later setting it to nil.
(edebug--display): Kill edebug-eval-buffer here...
(edebug--recursive-edit): ...rather than here.
Bind standard-output and standard-input.
(edebug-eval): Check cl-macroexpand-all is fboundp.
(edebug-temp-display-freq-count): Fix last change.
* lisp/emacs-lisp/easymenu.el (easy-menu-define): Add `debug' spec.
* lisp/subr.el (noreturn, 1value): Add `debug' spec.
* lisp/emacs-lisp/advice.el: Require cl-lib.
(ad-copy-tree): Remove, use copy-tree instead.
(ad-dolist): Remove use dolist or cl-dolist instead.
(ad-do-return): Remove, use cl-return instead.
(defadvice): Add `debug' spec.
2012-09-14 03:55:16 +00:00
|
|
|
|
(declare (debug t))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
`(prog1 ,form
|
|
|
|
|
(error "Form marked with `noreturn' did return")))
|
|
|
|
|
|
|
|
|
|
(defmacro 1value (form)
|
2005-12-30 02:59:47 +00:00
|
|
|
|
"Evaluate FORM, expecting a constant return value.
|
|
|
|
|
This is the global do-nothing version. There is also `testcover-1value'
|
|
|
|
|
that complains if FORM ever does return differing values."
|
* lisp/emacs-lisp/edebug.el: Miscellaneous cleanup.
Remove obsolete byte-compiler hack that tried to silence some warnings.
(edebug-submit-bug-report): Remove.
(edebug-get-buffer-window, edebug-sit-for, edebug-input-pending-p):
Remove aliases, use the un-prefixed name instead.
(edebug-pop-to-buffer): Consider other frames.
(edebug-original-read):: Make it more obvious that it's always defined.
(edebug--make-form-data-entry, edebug--form-data-name)
(edebug--form-data-begin, edebug--form-data-end): Rename from the
single-dashed name, and implement with cl-defstruct.
(edebug-set-form-data-entry): Use the standard accessors.
(edebug-make-top-form-data-entry): Use push.
(edebug-no-match): Drop useless `funcall'.
(mapcar, mapconcat, mapatoms, apply, funcall): Don't add debug specs
to functions.
(defsubst, dont-compile, eval-when-compile, eval-and-compile)
(delay-mode-hooks, with-temp-file, with-temp-message, ad-dolist)
(with-syntax-table, push, pop, 1value, noreturn, defadvice)
(easy-menu-define, with-custom-print): Remove redundant specs.
(edebug-outside-overriding-local-map)
(edebug-outside-overriding-terminal-local-map): Remove, unused.
(edebug--display): Bind unread-command-events directly to nil rather
than binding it to unread-command-events and later setting it to nil.
(edebug--display): Kill edebug-eval-buffer here...
(edebug--recursive-edit): ...rather than here.
Bind standard-output and standard-input.
(edebug-eval): Check cl-macroexpand-all is fboundp.
(edebug-temp-display-freq-count): Fix last change.
* lisp/emacs-lisp/easymenu.el (easy-menu-define): Add `debug' spec.
* lisp/subr.el (noreturn, 1value): Add `debug' spec.
* lisp/emacs-lisp/advice.el: Require cl-lib.
(ad-copy-tree): Remove, use copy-tree instead.
(ad-dolist): Remove use dolist or cl-dolist instead.
(ad-do-return): Remove, use cl-return instead.
(defadvice): Add `debug' spec.
2012-09-14 03:55:16 +00:00
|
|
|
|
(declare (debug t))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
form)
|
|
|
|
|
|
2006-07-09 02:00:10 +00:00
|
|
|
|
(defmacro def-edebug-spec (symbol spec)
|
|
|
|
|
"Set the `edebug-form-spec' property of SYMBOL according to SPEC.
|
2009-07-14 07:45:56 +00:00
|
|
|
|
Both SYMBOL and SPEC are unevaluated. The SPEC can be:
|
|
|
|
|
0 (instrument no arguments); t (instrument all arguments);
|
|
|
|
|
a symbol (naming a function with an Edebug specification); or a list.
|
|
|
|
|
The elements of the list describe the argument types; see
|
2011-05-28 19:36:02 +00:00
|
|
|
|
Info node `(elisp)Specification List' for details."
|
2006-07-09 02:00:10 +00:00
|
|
|
|
`(put (quote ,symbol) 'edebug-form-spec (quote ,spec)))
|
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
(defmacro lambda (&rest cdr)
|
|
|
|
|
"Return a lambda expression.
|
|
|
|
|
A call of the form (lambda ARGS DOCSTRING INTERACTIVE BODY) is
|
|
|
|
|
self-quoting; the result of evaluating the lambda expression is the
|
|
|
|
|
expression itself. The lambda expression may then be treated as a
|
1994-12-15 18:25:24 +00:00
|
|
|
|
function, i.e., stored as the function value of a symbol, passed to
|
2005-06-21 14:10:34 +00:00
|
|
|
|
`funcall' or `mapcar', etc.
|
1994-12-15 18:25:24 +00:00
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
ARGS should take the same form as an argument list for a `defun'.
|
1995-06-27 06:52:56 +00:00
|
|
|
|
DOCSTRING is an optional documentation string.
|
|
|
|
|
If present, it should describe how to call the function.
|
|
|
|
|
But documentation strings are usually not useful in nameless functions.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
INTERACTIVE should be a call to the function `interactive', which see.
|
|
|
|
|
It may also be omitted.
|
2004-05-07 01:06:20 +00:00
|
|
|
|
BODY should be a list of Lisp expressions.
|
|
|
|
|
|
|
|
|
|
\(fn ARGS [DOCSTRING] [INTERACTIVE] BODY)"
|
2012-05-26 15:52:27 +00:00
|
|
|
|
(declare (doc-string 2) (indent defun)
|
|
|
|
|
(debug (&define lambda-list
|
|
|
|
|
[&optional stringp]
|
|
|
|
|
[&optional ("interactive" interactive)]
|
|
|
|
|
def-body)))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
;; Note that this definition should not use backquotes; subr.el should not
|
|
|
|
|
;; depend on backquote.el.
|
|
|
|
|
(list 'function (cons 'lambda cdr)))
|
|
|
|
|
|
2012-05-05 01:47:04 +00:00
|
|
|
|
(defmacro setq-local (var val)
|
|
|
|
|
"Set variable VAR to value VAL in current buffer."
|
|
|
|
|
;; Can't use backquote here, it's too early in the bootstrap.
|
|
|
|
|
(list 'set (list 'make-local-variable (list 'quote var)) val))
|
|
|
|
|
|
|
|
|
|
(defmacro defvar-local (var val &optional docstring)
|
|
|
|
|
"Define VAR as a buffer-local variable with default value VAL.
|
|
|
|
|
Like `defvar' but additionally marks the variable as being automatically
|
|
|
|
|
buffer-local wherever it is set."
|
2012-05-08 14:11:47 +00:00
|
|
|
|
(declare (debug defvar) (doc-string 3))
|
2012-05-05 01:47:04 +00:00
|
|
|
|
;; Can't use backquote here, it's too early in the bootstrap.
|
|
|
|
|
(list 'progn (list 'defvar var val docstring)
|
|
|
|
|
(list 'make-variable-buffer-local (list 'quote var))))
|
|
|
|
|
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(defun apply-partially (fun &rest args)
|
|
|
|
|
"Return a function that is a partial application of FUN to ARGS.
|
|
|
|
|
ARGS is a list of the first N arguments to pass to FUN.
|
|
|
|
|
The result is a new function which does the same as FUN, except that
|
|
|
|
|
the first N arguments are fixed at the values with which this function
|
|
|
|
|
was called."
|
2011-03-30 18:40:00 +00:00
|
|
|
|
`(closure (t) (&rest args)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(apply ',fun ,@(mapcar (lambda (arg) `',arg) args) args)))
|
|
|
|
|
|
Provide generalized variables in core Elisp.
* lisp/emacs-lisp/gv.el: New file.
* lisp/subr.el (push, pop): Extend to generalized variables.
* lisp/loadup.el (macroexp): Unload if preloaded and uncompiled.
* lisp/emacs-lisp/cl-lib.el (cl-pop, cl-push, cl--set-nthcdr): Remove.
* lisp/emacs-lisp/cl-macs.el: Require gv. Use gv-define-setter,
gv-define-simple-setter, and gv-define-expander.
Remove setf-methods defined in gv. Rename cl-setf -> setf.
(cl-setf, cl-do-pop, cl-get-setf-method): Remove.
(cl-letf, cl-letf*, cl-define-modify-macro, cl-defsetf)
(cl-define-setf-expander, cl-struct-setf-expander): Move to cl.el.
(cl-remf, cl-shiftf, cl-rotatef, cl-callf, cl-callf2): Rewrite with
gv-letplace.
(cl-defstruct): Don't define setf-method any more.
* lisp/emacs-lisp/cl.el (flet): Don't autoload.
(cl--letf, letf, cl--letf*, letf*, cl--gv-adapt)
(define-setf-expander, defsetf, define-modify-macro)
(cl-struct-setf-expander): Move from cl-lib.el.
* lisp/emacs-lisp/syntax.el:
* lisp/emacs-lisp/ewoc.el:
* lisp/emacs-lisp/smie.el:
* lisp/emacs-lisp/cconv.el:
* lisp/emacs-lisp/timer.el: Rename cl-setf -> setf, cl-push -> push.
(timer--time): Use gv-define-simple-setter.
* lisp/emacs-lisp/macroexp.el (macroexp-let2): Rename from macroexp-let²
to avoid coding-system problems in subr.el. Adjust all users.
(macroexp--maxsize, macroexp-small-p): New functions.
* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Don't use cl-letf.
* lisp/scroll-bar.el (scroll-bar-mode):
* lisp/simple.el (auto-fill-mode, overwrite-mode, binary-overwrite-mode)
(normal-erase-is-backspace-mode): Don't use the `eq' place.
* lisp/winner.el (winner-configuration, winner-make-point-alist)
(winner-set-conf, winner-get-point, winner-set): Don't abuse letf.
* lisp/files.el (locate-file-completion-table): Avoid list*.
Fixes: debbugs:11657
2012-06-22 13:42:38 +00:00
|
|
|
|
(defmacro push (newelt place)
|
|
|
|
|
"Add NEWELT to the list stored in the generalized variable PLACE.
|
|
|
|
|
This is morally equivalent to (setf PLACE (cons NEWELT PLACE)),
|
|
|
|
|
except that PLACE is only evaluated once (after NEWELT)."
|
|
|
|
|
(declare (debug (form gv-place)))
|
|
|
|
|
(if (symbolp place)
|
|
|
|
|
;; Important special case, to avoid triggering GV too early in
|
|
|
|
|
;; the bootstrap.
|
|
|
|
|
(list 'setq place
|
|
|
|
|
(list 'cons newelt place))
|
|
|
|
|
(require 'macroexp)
|
|
|
|
|
(macroexp-let2 macroexp-copyable-p v newelt
|
|
|
|
|
(gv-letplace (getter setter) place
|
|
|
|
|
(funcall setter `(cons ,v ,getter))))))
|
|
|
|
|
|
|
|
|
|
(defmacro pop (place)
|
|
|
|
|
"Return the first element of PLACE's value, and remove it from the list.
|
|
|
|
|
PLACE must be a generalized variable whose value is a list.
|
1999-08-29 20:23:54 +00:00
|
|
|
|
If the value is nil, `pop' returns nil but does not actually
|
|
|
|
|
change the list."
|
Provide generalized variables in core Elisp.
* lisp/emacs-lisp/gv.el: New file.
* lisp/subr.el (push, pop): Extend to generalized variables.
* lisp/loadup.el (macroexp): Unload if preloaded and uncompiled.
* lisp/emacs-lisp/cl-lib.el (cl-pop, cl-push, cl--set-nthcdr): Remove.
* lisp/emacs-lisp/cl-macs.el: Require gv. Use gv-define-setter,
gv-define-simple-setter, and gv-define-expander.
Remove setf-methods defined in gv. Rename cl-setf -> setf.
(cl-setf, cl-do-pop, cl-get-setf-method): Remove.
(cl-letf, cl-letf*, cl-define-modify-macro, cl-defsetf)
(cl-define-setf-expander, cl-struct-setf-expander): Move to cl.el.
(cl-remf, cl-shiftf, cl-rotatef, cl-callf, cl-callf2): Rewrite with
gv-letplace.
(cl-defstruct): Don't define setf-method any more.
* lisp/emacs-lisp/cl.el (flet): Don't autoload.
(cl--letf, letf, cl--letf*, letf*, cl--gv-adapt)
(define-setf-expander, defsetf, define-modify-macro)
(cl-struct-setf-expander): Move from cl-lib.el.
* lisp/emacs-lisp/syntax.el:
* lisp/emacs-lisp/ewoc.el:
* lisp/emacs-lisp/smie.el:
* lisp/emacs-lisp/cconv.el:
* lisp/emacs-lisp/timer.el: Rename cl-setf -> setf, cl-push -> push.
(timer--time): Use gv-define-simple-setter.
* lisp/emacs-lisp/macroexp.el (macroexp-let2): Rename from macroexp-let²
to avoid coding-system problems in subr.el. Adjust all users.
(macroexp--maxsize, macroexp-small-p): New functions.
* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Don't use cl-letf.
* lisp/scroll-bar.el (scroll-bar-mode):
* lisp/simple.el (auto-fill-mode, overwrite-mode, binary-overwrite-mode)
(normal-erase-is-backspace-mode): Don't use the `eq' place.
* lisp/winner.el (winner-configuration, winner-make-point-alist)
(winner-set-conf, winner-get-point, winner-set): Don't abuse letf.
* lisp/files.el (locate-file-completion-table): Avoid list*.
Fixes: debbugs:11657
2012-06-22 13:42:38 +00:00
|
|
|
|
(declare (debug (gv-place)))
|
2013-09-05 03:46:34 +00:00
|
|
|
|
;; We use `car-safe' here instead of `car' because the behavior is the same
|
|
|
|
|
;; (if it's not a cons cell, the `cdr' would have signaled an error already),
|
|
|
|
|
;; but `car-safe' is total, so the byte-compiler can safely remove it if the
|
|
|
|
|
;; result is not used.
|
|
|
|
|
`(car-safe
|
|
|
|
|
,(if (symbolp place)
|
|
|
|
|
;; So we can use `pop' in the bootstrap before `gv' can be used.
|
|
|
|
|
(list 'prog1 place (list 'setq place (list 'cdr place)))
|
|
|
|
|
(gv-letplace (getter setter) place
|
|
|
|
|
`(prog1 ,getter ,(funcall setter `(cdr ,getter)))))))
|
1999-08-29 20:23:54 +00:00
|
|
|
|
|
1997-01-08 06:09:02 +00:00
|
|
|
|
(defmacro when (cond &rest body)
|
2007-03-18 00:44:24 +00:00
|
|
|
|
"If COND yields non-nil, do BODY, else return nil.
|
|
|
|
|
When COND yields non-nil, eval BODY forms sequentially and return
|
|
|
|
|
value of last one, or nil if there are none.
|
|
|
|
|
|
2007-07-14 11:11:43 +00:00
|
|
|
|
\(fn COND BODY...)"
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 1) (debug t))
|
1997-01-08 06:09:02 +00:00
|
|
|
|
(list 'if cond (cons 'progn body)))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
1997-01-08 06:09:02 +00:00
|
|
|
|
(defmacro unless (cond &rest body)
|
2007-03-18 00:44:24 +00:00
|
|
|
|
"If COND yields nil, do BODY, else return nil.
|
|
|
|
|
When COND yields nil, eval BODY forms sequentially and return
|
|
|
|
|
value of last one, or nil if there are none.
|
|
|
|
|
|
2007-07-14 11:11:43 +00:00
|
|
|
|
\(fn COND BODY...)"
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 1) (debug t))
|
1997-01-08 06:09:02 +00:00
|
|
|
|
(cons 'if (cons cond (cons nil body))))
|
1997-08-23 18:55:52 +00:00
|
|
|
|
|
2000-01-21 02:08:58 +00:00
|
|
|
|
(defmacro dolist (spec &rest body)
|
2003-05-17 22:00:40 +00:00
|
|
|
|
"Loop over a list.
|
2000-01-21 02:08:58 +00:00
|
|
|
|
Evaluate BODY with VAR bound to each car from LIST, in turn.
|
2003-05-17 22:00:40 +00:00
|
|
|
|
Then evaluate RESULT to get return value, default nil.
|
|
|
|
|
|
2003-07-08 16:57:15 +00:00
|
|
|
|
\(fn (VAR LIST [RESULT]) BODY...)"
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 1) (debug ((symbolp form &optional form) body)))
|
2006-07-24 17:01:08 +00:00
|
|
|
|
;; It would be cleaner to create an uninterned symbol,
|
|
|
|
|
;; but that uses a lot more space when many functions in many files
|
|
|
|
|
;; use dolist.
|
2011-03-16 20:08:39 +00:00
|
|
|
|
;; FIXME: This cost disappears in byte-compiled lexical-binding files.
|
2006-07-24 17:01:08 +00:00
|
|
|
|
(let ((temp '--dolist-tail--))
|
2011-03-30 18:40:00 +00:00
|
|
|
|
;; This is not a reliable test, but it does not matter because both
|
|
|
|
|
;; semantics are acceptable, tho one is slightly faster with dynamic
|
|
|
|
|
;; scoping and the other is slightly faster (and has cleaner semantics)
|
|
|
|
|
;; with lexical scoping.
|
|
|
|
|
(if lexical-binding
|
|
|
|
|
`(let ((,temp ,(nth 1 spec)))
|
|
|
|
|
(while ,temp
|
|
|
|
|
(let ((,(car spec) (car ,temp)))
|
|
|
|
|
,@body
|
|
|
|
|
(setq ,temp (cdr ,temp))))
|
2012-11-09 20:45:10 +00:00
|
|
|
|
,@(cdr (cdr spec)))
|
2011-03-30 18:40:00 +00:00
|
|
|
|
`(let ((,temp ,(nth 1 spec))
|
|
|
|
|
,(car spec))
|
|
|
|
|
(while ,temp
|
|
|
|
|
(setq ,(car spec) (car ,temp))
|
|
|
|
|
,@body
|
|
|
|
|
(setq ,temp (cdr ,temp)))
|
|
|
|
|
,@(if (cdr (cdr spec))
|
|
|
|
|
`((setq ,(car spec) nil) ,@(cdr (cdr spec))))))))
|
2006-07-24 17:01:08 +00:00
|
|
|
|
|
2000-01-21 02:08:58 +00:00
|
|
|
|
(defmacro dotimes (spec &rest body)
|
2003-05-17 22:00:40 +00:00
|
|
|
|
"Loop a certain number of times.
|
2000-01-21 02:08:58 +00:00
|
|
|
|
Evaluate BODY with VAR bound to successive integers running from 0,
|
|
|
|
|
inclusive, to COUNT, exclusive. Then evaluate RESULT to get
|
2003-05-17 22:00:40 +00:00
|
|
|
|
the return value (nil if RESULT is omitted).
|
|
|
|
|
|
2003-07-08 16:57:15 +00:00
|
|
|
|
\(fn (VAR COUNT [RESULT]) BODY...)"
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 1) (debug dolist))
|
2006-07-24 17:01:08 +00:00
|
|
|
|
;; It would be cleaner to create an uninterned symbol,
|
|
|
|
|
;; but that uses a lot more space when many functions in many files
|
|
|
|
|
;; use dotimes.
|
2011-03-30 18:40:00 +00:00
|
|
|
|
;; FIXME: This cost disappears in byte-compiled lexical-binding files.
|
2006-07-24 17:01:08 +00:00
|
|
|
|
(let ((temp '--dotimes-limit--)
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(start 0)
|
|
|
|
|
(end (nth 1 spec)))
|
2011-03-30 18:40:00 +00:00
|
|
|
|
;; This is not a reliable test, but it does not matter because both
|
|
|
|
|
;; semantics are acceptable, tho one is slightly faster with dynamic
|
|
|
|
|
;; scoping and the other has cleaner semantics.
|
|
|
|
|
(if lexical-binding
|
|
|
|
|
(let ((counter '--dotimes-counter--))
|
|
|
|
|
`(let ((,temp ,end)
|
|
|
|
|
(,counter ,start))
|
|
|
|
|
(while (< ,counter ,temp)
|
|
|
|
|
(let ((,(car spec) ,counter))
|
|
|
|
|
,@body)
|
|
|
|
|
(setq ,counter (1+ ,counter)))
|
|
|
|
|
,@(if (cddr spec)
|
|
|
|
|
;; FIXME: This let often leads to "unused var" warnings.
|
|
|
|
|
`((let ((,(car spec) ,counter)) ,@(cddr spec))))))
|
|
|
|
|
`(let ((,temp ,end)
|
|
|
|
|
(,(car spec) ,start))
|
|
|
|
|
(while (< ,(car spec) ,temp)
|
|
|
|
|
,@body
|
|
|
|
|
(setq ,(car spec) (1+ ,(car spec))))
|
|
|
|
|
,@(cdr (cdr spec))))))
|
2000-01-21 02:08:58 +00:00
|
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(defmacro declare (&rest _specs)
|
2012-09-25 05:33:43 +00:00
|
|
|
|
"Do not evaluate any arguments, and return nil.
|
|
|
|
|
If a `declare' form appears as the first form in the body of a
|
|
|
|
|
`defun' or `defmacro' form, SPECS specifies various additional
|
|
|
|
|
information about the function or macro; these go into effect
|
|
|
|
|
during the evaluation of the `defun' or `defmacro' form.
|
|
|
|
|
|
|
|
|
|
The possible values of SPECS are specified by
|
|
|
|
|
`defun-declarations-alist' and `macro-declarations-alist'."
|
Further GV/CL cleanups.
* lisp/emacs-lisp/gv.el (gv-get): Autoload functions to find their
gv-expander.
(gv--defun-declaration): New function.
(defun-declarations-alist): Use it.
(gv-define-modify-macro, gv-pushnew!, gv-inc!, gv-dec!): Remove.
(gv-place): Autoload.
* lisp/emacs-lisp/cl.el (cl--dotimes, cl--dolist): Remember subr.el's
original definition of dotimes and dolist.
* lisp/emacs-lisp/cl-macs.el (cl-expr-access-order): Remove unused.
(cl-dolist, cl-dotimes): Use `dolist' and `dotimes'.
* lisp/emacs-lisp/cl-lib.el: Move gv handlers from cl-macs to here.
(cl-fifth, cl-sixth, cl-seventh, cl-eighth)
(cl-ninth, cl-tenth): Move gv handler to the function's definition.
* lisp/emacs-lisp/cl-extra.el (cl-subseq, cl-get, cl-getf): Move gv handler
to the function's definition.
* lisp/Makefile.in (COMPILE_FIRST): Re-order to speed it up by about 50%.
* lisp/window.el:
* lisp/files.el:
* lisp/faces.el:
* lisp/env.el: Don't use CL.
2012-06-22 21:24:54 +00:00
|
|
|
|
;; FIXME: edebug spec should pay attention to defun-declarations-alist.
|
2009-09-17 20:47:48 +00:00
|
|
|
|
nil)
|
2008-05-07 02:57:53 +00:00
|
|
|
|
|
|
|
|
|
(defmacro ignore-errors (&rest body)
|
|
|
|
|
"Execute BODY; if an error occurs, return nil.
|
2012-09-11 17:47:25 +00:00
|
|
|
|
Otherwise, return result of last form in BODY.
|
|
|
|
|
See also `with-demoted-errors' that does something similar
|
|
|
|
|
without silencing all errors."
|
2010-08-11 13:43:49 +00:00
|
|
|
|
(declare (debug t) (indent 0))
|
2008-05-07 02:57:53 +00:00
|
|
|
|
`(condition-case nil (progn ,@body) (error nil)))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
;;;; Basic Lisp functions.
|
|
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(defun ignore (&rest _ignore)
|
2005-10-22 15:01:08 +00:00
|
|
|
|
"Do nothing and return nil.
|
|
|
|
|
This function accepts any number of arguments, but ignores them."
|
|
|
|
|
(interactive)
|
|
|
|
|
nil)
|
|
|
|
|
|
2009-10-16 03:21:18 +00:00
|
|
|
|
;; Signal a compile-error if the first arg is missing.
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun error (&rest args)
|
|
|
|
|
"Signal an error, making error message by passing all args to `format'.
|
|
|
|
|
In Emacs, the convention is that error messages start with a capital
|
|
|
|
|
letter but *do not* end with a period. Please follow this convention
|
2009-10-16 03:21:18 +00:00
|
|
|
|
for the sake of consistency."
|
2013-10-03 04:41:23 +00:00
|
|
|
|
(declare (advertised-calling-convention (string &rest args) "23.1"))
|
2013-10-30 02:14:16 +00:00
|
|
|
|
(signal 'error (list (apply 'format args))))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
Add new error and function `user-error'.
* lisp/subr.el (user-error): New function.
* lisp/window.el (switch-to-buffer):
* lisp/vc/smerge-mode.el (smerge-resolve-function, smerge-resolve)
(smerge-match-conflict):
* lisp/simple.el (previous-matching-history-element)
(next-matching-history-element, goto-history-element, undo-more)
(undo-start):
* lisp/progmodes/etags.el (visit-tags-table-buffer, find-tag-tag)
(find-tag-noselect, find-tag-in-order, etags-goto-tag-location)
(next-file, tags-loop-scan, list-tags, complete-tag):
* lisp/progmodes/compile.el (compilation-loop):
* lisp/mouse.el (mouse-minibuffer-check):
* lisp/man.el (Man-bgproc-sentinel, Man-goto-page):
* lisp/info.el (Info-find-node-2, Info-extract-pointer, Info-history-back)
(Info-history-forward, Info-follow-reference, Info-menu)
(Info-extract-menu-item, Info-extract-menu-counting)
(Info-forward-node, Info-backward-node, Info-next-menu-item)
(Info-last-menu-item, Info-next-preorder, Info-last-preorder)
(Info-next-reference, Info-prev-reference, Info-index)
(Info-index-next, Info-follow-nearest-node)
(Info-copy-current-node-name):
* lisp/imenu.el (imenu--make-index-alist)
(imenu-default-create-index-function, imenu-add-to-menubar):
* lisp/files.el (basic-save-buffer, recover-file):
* lisp/emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* lisp/emacs-lisp/checkdoc.el (checkdoc-continue, checkdoc-comments)
(checkdoc-message-text, checkdoc-defun):
* lisp/dabbrev.el (dabbrev-completion, dabbrev--abbrev-at-point):
* lisp/cus-edit.el (customize-changed-options, customize-rogue)
(customize-saved, custom-variable-set, custom-variable-mark-to-save)
(custom-variable-mark-to-reset-standard)
(custom-variable-reset-backup, custom-face-mark-to-reset-standard)
(custom-file):
* lisp/completion.el (check-completion-length):
* lisp/comint.el (comint-search-arg)
(comint-previous-matching-input-string-position)
(comint-previous-matching-input)
(comint-replace-by-expanded-history-before-point, comint-send-input)
(comint-copy-old-input, comint-backward-matching-input)
(comint-goto-process-mark, comint-set-process-mark):
* lisp/calendar/calendar.el (calendar-cursor-to-date): Use it.
* lisp/bindings.el (debug-ignored-errors): Remove regexps, add `user-error'.
* src/data.c (PUT_ERROR): New macro.
(syms_of_data): Use it. Add new error type `user-error'.
* src/undo.c (user_error): New function.
(Fprimitive_undo): Use it.
* src/print.c (print_error_message): Adjust print style for `user-error'.
* src/keyboard.c (user_error): New function.
(Fexit_recursive_edit, Fabort_recursive_edit): Use it.
2012-05-04 23:16:47 +00:00
|
|
|
|
(defun user-error (format &rest args)
|
|
|
|
|
"Signal a pilot error, making error message by passing all args to `format'.
|
|
|
|
|
In Emacs, the convention is that error messages start with a capital
|
|
|
|
|
letter but *do not* end with a period. Please follow this convention
|
|
|
|
|
for the sake of consistency.
|
|
|
|
|
This is just like `error' except that `user-error's are expected to be the
|
|
|
|
|
result of an incorrect manipulation on the part of the user, rather than the
|
|
|
|
|
result of an actual problem."
|
2013-10-30 02:14:16 +00:00
|
|
|
|
(signal 'user-error (list (apply #'format format args))))
|
Add new error and function `user-error'.
* lisp/subr.el (user-error): New function.
* lisp/window.el (switch-to-buffer):
* lisp/vc/smerge-mode.el (smerge-resolve-function, smerge-resolve)
(smerge-match-conflict):
* lisp/simple.el (previous-matching-history-element)
(next-matching-history-element, goto-history-element, undo-more)
(undo-start):
* lisp/progmodes/etags.el (visit-tags-table-buffer, find-tag-tag)
(find-tag-noselect, find-tag-in-order, etags-goto-tag-location)
(next-file, tags-loop-scan, list-tags, complete-tag):
* lisp/progmodes/compile.el (compilation-loop):
* lisp/mouse.el (mouse-minibuffer-check):
* lisp/man.el (Man-bgproc-sentinel, Man-goto-page):
* lisp/info.el (Info-find-node-2, Info-extract-pointer, Info-history-back)
(Info-history-forward, Info-follow-reference, Info-menu)
(Info-extract-menu-item, Info-extract-menu-counting)
(Info-forward-node, Info-backward-node, Info-next-menu-item)
(Info-last-menu-item, Info-next-preorder, Info-last-preorder)
(Info-next-reference, Info-prev-reference, Info-index)
(Info-index-next, Info-follow-nearest-node)
(Info-copy-current-node-name):
* lisp/imenu.el (imenu--make-index-alist)
(imenu-default-create-index-function, imenu-add-to-menubar):
* lisp/files.el (basic-save-buffer, recover-file):
* lisp/emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* lisp/emacs-lisp/checkdoc.el (checkdoc-continue, checkdoc-comments)
(checkdoc-message-text, checkdoc-defun):
* lisp/dabbrev.el (dabbrev-completion, dabbrev--abbrev-at-point):
* lisp/cus-edit.el (customize-changed-options, customize-rogue)
(customize-saved, custom-variable-set, custom-variable-mark-to-save)
(custom-variable-mark-to-reset-standard)
(custom-variable-reset-backup, custom-face-mark-to-reset-standard)
(custom-file):
* lisp/completion.el (check-completion-length):
* lisp/comint.el (comint-search-arg)
(comint-previous-matching-input-string-position)
(comint-previous-matching-input)
(comint-replace-by-expanded-history-before-point, comint-send-input)
(comint-copy-old-input, comint-backward-matching-input)
(comint-goto-process-mark, comint-set-process-mark):
* lisp/calendar/calendar.el (calendar-cursor-to-date): Use it.
* lisp/bindings.el (debug-ignored-errors): Remove regexps, add `user-error'.
* src/data.c (PUT_ERROR): New macro.
(syms_of_data): Use it. Add new error type `user-error'.
* src/undo.c (user_error): New function.
(Fprimitive_undo): Use it.
* src/print.c (print_error_message): Adjust print style for `user-error'.
* src/keyboard.c (user_error): New function.
(Fexit_recursive_edit, Fabort_recursive_edit): Use it.
2012-05-04 23:16:47 +00:00
|
|
|
|
|
* lisp/subr.el (define-error): New function.
* doc/lispref/control.texi (Signaling Errors): Refer to define-error.
(Error Symbols): Add `define-error'.
* doc/lispref/errors.texi (Standard Errors): Don't refer to `error-conditions'.
* lisp/progmodes/ada-xref.el (ada-error-file-not-found): Rename from
error-file-not-found and define with define-error.
* lisp/emacs-lisp/cl-lib.el (cl-assertion-failed): Move here from subr.el
and define with define-error.
* lisp/userlock.el (file-locked, file-supersession):
* lisp/simple.el (mark-inactive):
* lisp/progmodes/js.el (js-moz-bad-rpc, js-js-error):
* lisp/progmodes/ada-mode.el (ada-mode-errors):
* lisp/play/life.el (life-extinct):
* lisp/nxml/xsd-regexp.el (xsdre-invalid-regexp, xsdre-parse-error):
* lisp/nxml/xmltok.el (xmltok-markup-declaration-parse-error):
* lisp/nxml/rng-util.el (rng-error):
* lisp/nxml/rng-uri.el (rng-uri-error):
* lisp/nxml/rng-match.el (rng-compile-error):
* lisp/nxml/rng-cmpct.el (rng-c-incorrect-schema):
* lisp/nxml/nxml-util.el (nxml-error, nxml-file-parse-error):
* lisp/nxml/nxml-rap.el (nxml-scan-error):
* lisp/nxml/nxml-outln.el (nxml-outline-error):
* lisp/net/soap-client.el (soap-error):
* lisp/net/gnutls.el (gnutls-error):
* lisp/net/ange-ftp.el (ftp-error):
* lisp/mpc.el (mpc-proc-error):
* lisp/json.el (json-error, json-readtable-error, json-unknown-keyword)
(json-number-format, json-string-escape, json-string-format)
(json-key-format, json-object-format):
* lisp/jka-compr.el (compression-error):
* lisp/international/quail.el (quail-error):
* lisp/international/kkc.el (kkc-error):
* lisp/emacs-lisp/ert.el (ert-test-failed):
* lisp/calc/calc.el (calc-error, inexact-result, math-overflow)
(math-underflow):
* lisp/bookmark.el (bookmark-error-no-filename):
* lisp/epg.el (epg-error): Define with define-error.
2013-08-09 21:22:44 +00:00
|
|
|
|
(defun define-error (name message &optional parent)
|
|
|
|
|
"Define NAME as a new error signal.
|
|
|
|
|
MESSAGE is a string that will be output to the echo area if such an error
|
|
|
|
|
is signaled without being caught by a `condition-case'.
|
|
|
|
|
PARENT is either a signal or a list of signals from which it inherits.
|
|
|
|
|
Defaults to `error'."
|
|
|
|
|
(unless parent (setq parent 'error))
|
|
|
|
|
(let ((conditions
|
|
|
|
|
(if (consp parent)
|
|
|
|
|
(apply #'nconc
|
|
|
|
|
(mapcar (lambda (parent)
|
|
|
|
|
(cons parent
|
|
|
|
|
(or (get parent 'error-conditions)
|
|
|
|
|
(error "Unknown signal `%s'" parent))))
|
|
|
|
|
parent))
|
|
|
|
|
(cons parent (get parent 'error-conditions)))))
|
|
|
|
|
(put name 'error-conditions
|
|
|
|
|
(delete-dups (copy-sequence (cons name conditions))))
|
|
|
|
|
(when message (put name 'error-message message))))
|
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;; We put this here instead of in frame.el so that it's defined even on
|
|
|
|
|
;; systems where frame.el isn't loaded.
|
|
|
|
|
(defun frame-configuration-p (object)
|
|
|
|
|
"Return non-nil if OBJECT seems to be a frame configuration.
|
|
|
|
|
Any list whose car is `frame-configuration' is assumed to be a frame
|
|
|
|
|
configuration."
|
|
|
|
|
(and (consp object)
|
|
|
|
|
(eq (car object) 'frame-configuration)))
|
|
|
|
|
|
|
|
|
|
;;;; List functions.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
1997-08-23 18:55:52 +00:00
|
|
|
|
(defsubst caar (x)
|
|
|
|
|
"Return the car of the car of X."
|
|
|
|
|
(car (car x)))
|
|
|
|
|
|
|
|
|
|
(defsubst cadr (x)
|
|
|
|
|
"Return the car of the cdr of X."
|
|
|
|
|
(car (cdr x)))
|
|
|
|
|
|
|
|
|
|
(defsubst cdar (x)
|
|
|
|
|
"Return the cdr of the car of X."
|
|
|
|
|
(cdr (car x)))
|
|
|
|
|
|
|
|
|
|
(defsubst cddr (x)
|
|
|
|
|
"Return the cdr of the cdr of X."
|
|
|
|
|
(cdr (cdr x)))
|
1997-08-23 19:10:42 +00:00
|
|
|
|
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(defun last (list &optional n)
|
|
|
|
|
"Return the last link of LIST. Its car is the last element.
|
|
|
|
|
If LIST is nil, return nil.
|
|
|
|
|
If N is non-nil, return the Nth-to-last link of LIST.
|
|
|
|
|
If N is bigger than the length of LIST, return LIST."
|
1997-08-27 22:34:30 +00:00
|
|
|
|
(if n
|
2010-10-13 23:43:39 +00:00
|
|
|
|
(and (>= n 0)
|
2010-10-13 23:15:03 +00:00
|
|
|
|
(let ((m (safe-length list)))
|
2010-10-13 03:30:36 +00:00
|
|
|
|
(if (< n m) (nthcdr (- m n) list) list)))
|
|
|
|
|
(and list
|
2010-10-13 23:15:03 +00:00
|
|
|
|
(nthcdr (1- (safe-length list)) list))))
|
1998-07-31 10:53:30 +00:00
|
|
|
|
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(defun butlast (list &optional n)
|
2014-02-01 07:54:29 +00:00
|
|
|
|
"Return a copy of LIST with the last N elements removed.
|
|
|
|
|
If N is omitted or nil, the last element is removed from the
|
|
|
|
|
copy."
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(if (and n (<= n 0)) list
|
|
|
|
|
(nbutlast (copy-sequence list) n)))
|
2000-12-28 12:15:44 +00:00
|
|
|
|
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(defun nbutlast (list &optional n)
|
2014-02-01 07:54:29 +00:00
|
|
|
|
"Modifies LIST to remove the last N elements.
|
|
|
|
|
If N is omitted or nil, remove the last element."
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(let ((m (length list)))
|
2000-12-28 12:15:44 +00:00
|
|
|
|
(or n (setq n 1))
|
|
|
|
|
(and (< n m)
|
|
|
|
|
(progn
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(if (> n 0) (setcdr (nthcdr (- (1- m) n) list) nil))
|
|
|
|
|
list))))
|
2000-12-28 12:15:44 +00:00
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(defun delete-dups (list)
|
|
|
|
|
"Destructively remove `equal' duplicates from LIST.
|
|
|
|
|
Store the result in LIST and return it. LIST must be a proper list.
|
|
|
|
|
Of several `equal' occurrences of an element in LIST, the first
|
|
|
|
|
one is kept."
|
|
|
|
|
(let ((tail list))
|
|
|
|
|
(while tail
|
|
|
|
|
(setcdr tail (delete (car tail) (cdr tail)))
|
|
|
|
|
(setq tail (cdr tail))))
|
|
|
|
|
list)
|
|
|
|
|
|
2013-05-17 02:43:41 +00:00
|
|
|
|
;; See http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00204.html
|
|
|
|
|
(defun delete-consecutive-dups (list &optional circular)
|
|
|
|
|
"Destructively remove `equal' consecutive duplicates from LIST.
|
|
|
|
|
First and last elements are considered consecutive if CIRCULAR is
|
|
|
|
|
non-nil."
|
|
|
|
|
(let ((tail list) last)
|
|
|
|
|
(while (consp tail)
|
|
|
|
|
(if (equal (car tail) (cadr tail))
|
|
|
|
|
(setcdr tail (cddr tail))
|
|
|
|
|
(setq last (car tail)
|
|
|
|
|
tail (cdr tail))))
|
|
|
|
|
(if (and circular
|
|
|
|
|
(cdr list)
|
|
|
|
|
(equal last (car list)))
|
|
|
|
|
(nbutlast list)
|
|
|
|
|
list)))
|
|
|
|
|
|
2003-04-05 02:13:44 +00:00
|
|
|
|
(defun number-sequence (from &optional to inc)
|
2003-04-03 02:43:11 +00:00
|
|
|
|
"Return a sequence of numbers from FROM to TO (both inclusive) as a list.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
INC is the increment used between numbers in the sequence and defaults to 1.
|
2013-06-11 16:51:12 +00:00
|
|
|
|
So, the Nth element of the list is (+ FROM (* N INC)) where N counts from
|
2004-04-16 12:51:06 +00:00
|
|
|
|
zero. TO is only included if there is an N for which TO = FROM + N * INC.
|
2013-06-11 16:51:12 +00:00
|
|
|
|
If TO is nil or numerically equal to FROM, return (FROM).
|
2004-04-16 12:51:06 +00:00
|
|
|
|
If INC is positive and TO is less than FROM, or INC is negative
|
|
|
|
|
and TO is larger than FROM, return nil.
|
|
|
|
|
If INC is zero and TO is neither nil nor numerically equal to
|
|
|
|
|
FROM, signal an error.
|
|
|
|
|
|
|
|
|
|
This function is primarily designed for integer arguments.
|
|
|
|
|
Nevertheless, FROM, TO and INC can be integer or float. However,
|
|
|
|
|
floating point arithmetic is inexact. For instance, depending on
|
|
|
|
|
the machine, it may quite well happen that
|
2013-06-11 16:51:12 +00:00
|
|
|
|
\(number-sequence 0.4 0.6 0.2) returns the one element list (0.4),
|
|
|
|
|
whereas (number-sequence 0.4 0.8 0.2) returns a list with three
|
2004-04-16 12:51:06 +00:00
|
|
|
|
elements. Thus, if some of the arguments are floats and one wants
|
|
|
|
|
to make sure that TO is included, one may have to explicitly write
|
2013-06-11 16:51:12 +00:00
|
|
|
|
TO as (+ FROM (* N INC)) or use a variable whose value was
|
2004-04-16 12:51:06 +00:00
|
|
|
|
computed with this exact expression. Alternatively, you can,
|
|
|
|
|
of course, also replace TO with a slightly larger value
|
|
|
|
|
\(or a slightly more negative value if INC is negative)."
|
|
|
|
|
(if (or (not to) (= from to))
|
2003-04-05 02:13:44 +00:00
|
|
|
|
(list from)
|
|
|
|
|
(or inc (setq inc 1))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(when (zerop inc) (error "The increment can not be zero"))
|
|
|
|
|
(let (seq (n 0) (next from))
|
|
|
|
|
(if (> inc 0)
|
|
|
|
|
(while (<= next to)
|
|
|
|
|
(setq seq (cons next seq)
|
|
|
|
|
n (1+ n)
|
|
|
|
|
next (+ from (* n inc))))
|
|
|
|
|
(while (>= next to)
|
|
|
|
|
(setq seq (cons next seq)
|
|
|
|
|
n (1+ n)
|
|
|
|
|
next (+ from (* n inc)))))
|
2003-04-05 02:13:44 +00:00
|
|
|
|
(nreverse seq))))
|
2003-04-03 02:43:11 +00:00
|
|
|
|
|
2002-06-08 20:48:15 +00:00
|
|
|
|
(defun copy-tree (tree &optional vecp)
|
|
|
|
|
"Make a copy of TREE.
|
|
|
|
|
If TREE is a cons cell, this recursively copies both its car and its cdr.
|
2002-06-10 09:01:08 +00:00
|
|
|
|
Contrast to `copy-sequence', which copies only along the cdrs. With second
|
2002-06-08 20:48:15 +00:00
|
|
|
|
argument VECP, this copies vectors as well as conses."
|
|
|
|
|
(if (consp tree)
|
2002-06-10 09:01:08 +00:00
|
|
|
|
(let (result)
|
|
|
|
|
(while (consp tree)
|
|
|
|
|
(let ((newcar (car tree)))
|
|
|
|
|
(if (or (consp (car tree)) (and vecp (vectorp (car tree))))
|
|
|
|
|
(setq newcar (copy-tree (car tree) vecp)))
|
|
|
|
|
(push newcar result))
|
|
|
|
|
(setq tree (cdr tree)))
|
2002-06-14 05:49:03 +00:00
|
|
|
|
(nconc (nreverse result) tree))
|
2002-06-08 20:48:15 +00:00
|
|
|
|
(if (and vecp (vectorp tree))
|
|
|
|
|
(let ((i (length (setq tree (copy-sequence tree)))))
|
|
|
|
|
(while (>= (setq i (1- i)) 0)
|
2002-06-10 09:01:08 +00:00
|
|
|
|
(aset tree i (copy-tree (aref tree i) vecp)))
|
|
|
|
|
tree)
|
|
|
|
|
tree)))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
;;;; Various list-search functions.
|
2002-06-08 20:48:15 +00:00
|
|
|
|
|
1998-08-08 23:07:06 +00:00
|
|
|
|
(defun assoc-default (key alist &optional test default)
|
|
|
|
|
"Find object KEY in a pseudo-alist ALIST.
|
2009-04-29 04:46:15 +00:00
|
|
|
|
ALIST is a list of conses or objects. Each element
|
|
|
|
|
(or the element's car, if it is a cons) is compared with KEY by
|
|
|
|
|
calling TEST, with two arguments: (i) the element or its car,
|
|
|
|
|
and (ii) KEY.
|
|
|
|
|
If that is non-nil, the element matches; then `assoc-default'
|
|
|
|
|
returns the element's cdr, if it is a cons, or DEFAULT if the
|
|
|
|
|
element is not a cons.
|
1998-08-08 23:07:06 +00:00
|
|
|
|
|
|
|
|
|
If no element matches, the value is nil.
|
|
|
|
|
If TEST is omitted or nil, `equal' is used."
|
|
|
|
|
(let (found (tail alist) value)
|
|
|
|
|
(while (and tail (not found))
|
|
|
|
|
(let ((elt (car tail)))
|
|
|
|
|
(when (funcall (or test 'equal) (if (consp elt) (car elt) elt) key)
|
|
|
|
|
(setq found t value (if (consp elt) (cdr elt) default))))
|
|
|
|
|
(setq tail (cdr tail)))
|
|
|
|
|
value))
|
1999-08-16 21:04:49 +00:00
|
|
|
|
|
|
|
|
|
(defun assoc-ignore-case (key alist)
|
|
|
|
|
"Like `assoc', but ignores differences in case and text representation.
|
|
|
|
|
KEY must be a string. Upper-case and lower-case letters are treated as equal.
|
|
|
|
|
Unibyte strings are converted to multibyte for comparison."
|
Use declare forms, where possible, to mark obsolete functions.
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.
* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.
* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.
* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.
* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.
* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.
* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
* lisp/international/mule-util.el (string-to-sequence): Remove.
* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.
* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.
* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
2012-09-25 04:13:02 +00:00
|
|
|
|
(declare (obsolete assoc-string "22.1"))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(assoc-string key alist t))
|
1999-08-16 21:04:49 +00:00
|
|
|
|
|
|
|
|
|
(defun assoc-ignore-representation (key alist)
|
|
|
|
|
"Like `assoc', but ignores differences in text representation.
|
2002-10-17 15:42:10 +00:00
|
|
|
|
KEY must be a string.
|
1999-08-16 21:04:49 +00:00
|
|
|
|
Unibyte strings are converted to multibyte for comparison."
|
Use declare forms, where possible, to mark obsolete functions.
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.
* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.
* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.
* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.
* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.
* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.
* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
* lisp/international/mule-util.el (string-to-sequence): Remove.
* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.
* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.
* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
2012-09-25 04:13:02 +00:00
|
|
|
|
(declare (obsolete assoc-string "22.1"))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(assoc-string key alist nil))
|
2000-04-03 19:29:56 +00:00
|
|
|
|
|
|
|
|
|
(defun member-ignore-case (elt list)
|
2010-12-11 02:34:55 +00:00
|
|
|
|
"Like `member', but ignore differences in case and text representation.
|
2000-04-03 19:29:56 +00:00
|
|
|
|
ELT must be a string. Upper-case and lower-case letters are treated as equal.
|
2002-04-27 19:49:18 +00:00
|
|
|
|
Unibyte strings are converted to multibyte for comparison.
|
|
|
|
|
Non-strings in LIST are ignored."
|
|
|
|
|
(while (and list
|
|
|
|
|
(not (and (stringp (car list))
|
|
|
|
|
(eq t (compare-strings elt 0 nil (car list) 0 nil t)))))
|
2000-11-29 04:36:30 +00:00
|
|
|
|
(setq list (cdr list)))
|
|
|
|
|
list)
|
2000-04-03 19:29:56 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun assq-delete-all (key alist)
|
|
|
|
|
"Delete from ALIST all elements whose car is `eq' to KEY.
|
|
|
|
|
Return the modified alist.
|
|
|
|
|
Elements of ALIST that are not conses are ignored."
|
|
|
|
|
(while (and (consp (car alist))
|
|
|
|
|
(eq (car (car alist)) key))
|
|
|
|
|
(setq alist (cdr alist)))
|
|
|
|
|
(let ((tail alist) tail-cdr)
|
|
|
|
|
(while (setq tail-cdr (cdr tail))
|
|
|
|
|
(if (and (consp (car tail-cdr))
|
|
|
|
|
(eq (car (car tail-cdr)) key))
|
|
|
|
|
(setcdr tail (cdr tail-cdr))
|
|
|
|
|
(setq tail tail-cdr))))
|
|
|
|
|
alist)
|
|
|
|
|
|
|
|
|
|
(defun rassq-delete-all (value alist)
|
|
|
|
|
"Delete from ALIST all elements whose cdr is `eq' to VALUE.
|
|
|
|
|
Return the modified alist.
|
|
|
|
|
Elements of ALIST that are not conses are ignored."
|
|
|
|
|
(while (and (consp (car alist))
|
|
|
|
|
(eq (cdr (car alist)) value))
|
|
|
|
|
(setq alist (cdr alist)))
|
|
|
|
|
(let ((tail alist) tail-cdr)
|
|
|
|
|
(while (setq tail-cdr (cdr tail))
|
|
|
|
|
(if (and (consp (car tail-cdr))
|
|
|
|
|
(eq (cdr (car tail-cdr)) value))
|
|
|
|
|
(setcdr tail (cdr tail-cdr))
|
|
|
|
|
(setq tail tail-cdr))))
|
|
|
|
|
alist)
|
|
|
|
|
|
|
|
|
|
(defun remove (elt seq)
|
|
|
|
|
"Return a copy of SEQ with all occurrences of ELT removed.
|
|
|
|
|
SEQ must be a list, vector, or string. The comparison is done with `equal'."
|
|
|
|
|
(if (nlistp seq)
|
|
|
|
|
;; If SEQ isn't a list, there's no need to copy SEQ because
|
|
|
|
|
;; `delete' will return a new object.
|
|
|
|
|
(delete elt seq)
|
|
|
|
|
(delete elt (copy-sequence seq))))
|
|
|
|
|
|
|
|
|
|
(defun remq (elt list)
|
|
|
|
|
"Return LIST with all occurrences of ELT removed.
|
|
|
|
|
The comparison is done with `eq'. Contrary to `delq', this does not use
|
|
|
|
|
side-effects, and the argument LIST is not modified."
|
2011-07-09 00:50:01 +00:00
|
|
|
|
(while (and (eq elt (car list)) (setq list (cdr list))))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(if (memq elt list)
|
|
|
|
|
(delq elt (copy-sequence list))
|
|
|
|
|
list))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
|
|
|
|
;;;; Keymap support.
|
1990-11-05 10:06:02 +00:00
|
|
|
|
|
2012-06-07 16:20:28 +00:00
|
|
|
|
(defun kbd (keys)
|
|
|
|
|
"Convert KEYS to the internal Emacs key representation.
|
|
|
|
|
KEYS should be a string constant in the format used for
|
|
|
|
|
saving keyboard macros (see `edmacro-mode')."
|
|
|
|
|
;; Don't use a defalias, since the `pure' property is only true for
|
|
|
|
|
;; the calling convention of `kbd'.
|
|
|
|
|
(read-kbd-macro keys))
|
2012-05-05 01:47:04 +00:00
|
|
|
|
(put 'kbd 'pure t)
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
1990-11-05 10:06:02 +00:00
|
|
|
|
(defun undefined ()
|
2011-01-11 03:23:04 +00:00
|
|
|
|
"Beep to tell the user this binding is undefined."
|
1990-11-05 10:06:02 +00:00
|
|
|
|
(interactive)
|
2013-10-29 21:05:35 +00:00
|
|
|
|
(ding)
|
|
|
|
|
(message "%s is undefined" (key-description (this-single-command-keys)))
|
|
|
|
|
(setq defining-kbd-macro nil)
|
|
|
|
|
(force-mode-line-update)
|
|
|
|
|
;; If this is a down-mouse event, don't reset prefix-arg;
|
|
|
|
|
;; pass it to the command run by the up event.
|
|
|
|
|
(setq prefix-arg
|
|
|
|
|
(when (memq 'down (event-modifiers last-command-event))
|
|
|
|
|
current-prefix-arg)))
|
1990-11-05 10:06:02 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;; Prevent the \{...} documentation construct
|
|
|
|
|
;; from mentioning keys that run this command.
|
1990-11-05 10:06:02 +00:00
|
|
|
|
(put 'undefined 'suppress-keymap t)
|
|
|
|
|
|
|
|
|
|
(defun suppress-keymap (map &optional nodigits)
|
|
|
|
|
"Make MAP override all normally self-inserting keys to be undefined.
|
|
|
|
|
Normally, as an exception, digits and minus-sign are set to make prefix args,
|
|
|
|
|
but optional second arg NODIGITS non-nil treats them like other chars."
|
2002-08-26 12:38:59 +00:00
|
|
|
|
(define-key map [remap self-insert-command] 'undefined)
|
1990-11-05 10:06:02 +00:00
|
|
|
|
(or nodigits
|
|
|
|
|
(let (loop)
|
|
|
|
|
(define-key map "-" 'negative-argument)
|
|
|
|
|
;; Make plain numbers do numeric args.
|
|
|
|
|
(setq loop ?0)
|
|
|
|
|
(while (<= loop ?9)
|
|
|
|
|
(define-key map (char-to-string loop) 'digit-argument)
|
|
|
|
|
(setq loop (1+ loop))))))
|
|
|
|
|
|
2011-08-03 21:40:06 +00:00
|
|
|
|
(defun make-composed-keymap (maps &optional parent)
|
|
|
|
|
"Construct a new keymap composed of MAPS and inheriting from PARENT.
|
|
|
|
|
When looking up a key in the returned map, the key is looked in each
|
|
|
|
|
keymap of MAPS in turn until a binding is found.
|
|
|
|
|
If no binding is found in MAPS, the lookup continues in PARENT, if non-nil.
|
|
|
|
|
As always with keymap inheritance, a nil binding in MAPS overrides
|
|
|
|
|
any corresponding binding in PARENT, but it does not override corresponding
|
|
|
|
|
bindings in other keymaps of MAPS.
|
|
|
|
|
MAPS can be a list of keymaps or a single keymap.
|
|
|
|
|
PARENT if non-nil should be a keymap."
|
|
|
|
|
`(keymap
|
|
|
|
|
,@(if (keymapp maps) (list maps) maps)
|
|
|
|
|
,@parent))
|
|
|
|
|
|
2000-02-23 11:40:06 +00:00
|
|
|
|
(defun define-key-after (keymap key definition &optional after)
|
1993-06-26 04:18:37 +00:00
|
|
|
|
"Add binding in KEYMAP for KEY => DEFINITION, right after AFTER's binding.
|
|
|
|
|
This is like `define-key' except that the binding for KEY is placed
|
|
|
|
|
just after the binding for the event AFTER, instead of at the beginning
|
1996-11-10 05:02:38 +00:00
|
|
|
|
of the map. Note that AFTER must be an event type (like KEY), NOT a command
|
|
|
|
|
\(like DEFINITION).
|
|
|
|
|
|
2000-02-23 11:40:06 +00:00
|
|
|
|
If AFTER is t or omitted, the new binding goes at the end of the keymap.
|
2001-10-05 09:26:17 +00:00
|
|
|
|
AFTER should be a single event type--a symbol or a character, not a sequence.
|
1996-11-10 05:02:38 +00:00
|
|
|
|
|
2000-02-23 11:40:06 +00:00
|
|
|
|
Bindings are always added before any inherited map.
|
1996-11-10 05:02:38 +00:00
|
|
|
|
|
2011-10-06 19:15:19 +00:00
|
|
|
|
The order of bindings in a keymap only matters when it is used as
|
|
|
|
|
a menu, so this function is not useful for non-menu keymaps."
|
2000-02-23 11:40:06 +00:00
|
|
|
|
(unless after (setq after t))
|
1993-06-26 04:18:37 +00:00
|
|
|
|
(or (keymapp keymap)
|
|
|
|
|
(signal 'wrong-type-argument (list 'keymapp keymap)))
|
2001-10-05 09:26:17 +00:00
|
|
|
|
(setq key
|
|
|
|
|
(if (<= (length key) 1) (aref key 0)
|
|
|
|
|
(setq keymap (lookup-key keymap
|
|
|
|
|
(apply 'vector
|
|
|
|
|
(butlast (mapcar 'identity key)))))
|
|
|
|
|
(aref key (1- (length key)))))
|
|
|
|
|
(let ((tail keymap) done inserted)
|
1993-06-26 04:18:37 +00:00
|
|
|
|
(while (and (not done) tail)
|
|
|
|
|
;; Delete any earlier bindings for the same key.
|
2001-10-05 09:26:17 +00:00
|
|
|
|
(if (eq (car-safe (car (cdr tail))) key)
|
1993-06-26 04:18:37 +00:00
|
|
|
|
(setcdr tail (cdr (cdr tail))))
|
2001-10-05 09:26:17 +00:00
|
|
|
|
;; If we hit an included map, go down that one.
|
|
|
|
|
(if (keymapp (car tail)) (setq tail (car tail)))
|
1993-06-26 04:18:37 +00:00
|
|
|
|
;; When we reach AFTER's binding, insert the new binding after.
|
|
|
|
|
;; If we reach an inherited keymap, insert just before that.
|
1993-06-30 04:36:37 +00:00
|
|
|
|
;; If we reach the end of this keymap, insert at the end.
|
1996-11-10 05:02:38 +00:00
|
|
|
|
(if (or (and (eq (car-safe (car tail)) after)
|
|
|
|
|
(not (eq after t)))
|
1993-06-30 04:36:37 +00:00
|
|
|
|
(eq (car (cdr tail)) 'keymap)
|
|
|
|
|
(null (cdr tail)))
|
1993-06-26 04:18:37 +00:00
|
|
|
|
(progn
|
1993-06-30 04:36:37 +00:00
|
|
|
|
;; Stop the scan only if we find a parent keymap.
|
|
|
|
|
;; Keep going past the inserted element
|
|
|
|
|
;; so we can delete any duplications that come later.
|
|
|
|
|
(if (eq (car (cdr tail)) 'keymap)
|
|
|
|
|
(setq done t))
|
|
|
|
|
;; Don't insert more than once.
|
|
|
|
|
(or inserted
|
2001-10-05 09:26:17 +00:00
|
|
|
|
(setcdr tail (cons (cons key definition) (cdr tail))))
|
1993-06-30 04:36:37 +00:00
|
|
|
|
(setq inserted t)))
|
1993-06-26 04:18:37 +00:00
|
|
|
|
(setq tail (cdr tail)))))
|
|
|
|
|
|
2008-03-25 19:42:34 +00:00
|
|
|
|
(defun map-keymap-sorted (function keymap)
|
2004-11-16 17:05:18 +00:00
|
|
|
|
"Implement `map-keymap' with sorting.
|
|
|
|
|
Don't call this function; it is for internal use only."
|
2008-03-25 19:42:34 +00:00
|
|
|
|
(let (list)
|
|
|
|
|
(map-keymap (lambda (a b) (push (cons a b) list))
|
|
|
|
|
keymap)
|
|
|
|
|
(setq list (sort list
|
|
|
|
|
(lambda (a b)
|
|
|
|
|
(setq a (car a) b (car b))
|
|
|
|
|
(if (integerp a)
|
|
|
|
|
(if (integerp b) (< a b)
|
|
|
|
|
t)
|
|
|
|
|
(if (integerp b) t
|
|
|
|
|
;; string< also accepts symbols.
|
|
|
|
|
(string< a b))))))
|
|
|
|
|
(dolist (p list)
|
|
|
|
|
(funcall function (car p) (cdr p)))))
|
2002-03-29 23:13:26 +00:00
|
|
|
|
|
2011-07-02 04:27:41 +00:00
|
|
|
|
(defun keymap--menu-item-binding (val)
|
|
|
|
|
"Return the binding part of a menu-item."
|
|
|
|
|
(cond
|
|
|
|
|
((not (consp val)) val) ;Not a menu-item.
|
|
|
|
|
((eq 'menu-item (car val))
|
|
|
|
|
(let* ((binding (nth 2 val))
|
|
|
|
|
(plist (nthcdr 3 val))
|
|
|
|
|
(filter (plist-get plist :filter)))
|
|
|
|
|
(if filter (funcall filter binding)
|
|
|
|
|
binding)))
|
|
|
|
|
((and (consp (cdr val)) (stringp (cadr val)))
|
|
|
|
|
(cddr val))
|
|
|
|
|
((stringp (car val))
|
|
|
|
|
(cdr val))
|
|
|
|
|
(t val))) ;Not a menu-item either.
|
|
|
|
|
|
|
|
|
|
(defun keymap--menu-item-with-binding (item binding)
|
|
|
|
|
"Build a menu-item like ITEM but with its binding changed to BINDING."
|
|
|
|
|
(cond
|
2011-10-31 10:53:16 +00:00
|
|
|
|
((not (consp item)) binding) ;Not a menu-item.
|
2011-07-02 04:27:41 +00:00
|
|
|
|
((eq 'menu-item (car item))
|
|
|
|
|
(setq item (copy-sequence item))
|
|
|
|
|
(let ((tail (nthcdr 2 item)))
|
|
|
|
|
(setcar tail binding)
|
|
|
|
|
;; Remove any potential filter.
|
|
|
|
|
(if (plist-get (cdr tail) :filter)
|
|
|
|
|
(setcdr tail (plist-put (cdr tail) :filter nil))))
|
|
|
|
|
item)
|
|
|
|
|
((and (consp (cdr item)) (stringp (cadr item)))
|
|
|
|
|
(cons (car item) (cons (cadr item) binding)))
|
|
|
|
|
(t (cons (car item) binding))))
|
|
|
|
|
|
|
|
|
|
(defun keymap--merge-bindings (val1 val2)
|
|
|
|
|
"Merge bindings VAL1 and VAL2."
|
|
|
|
|
(let ((map1 (keymap--menu-item-binding val1))
|
|
|
|
|
(map2 (keymap--menu-item-binding val2)))
|
|
|
|
|
(if (not (and (keymapp map1) (keymapp map2)))
|
|
|
|
|
;; There's nothing to merge: val1 takes precedence.
|
|
|
|
|
val1
|
|
|
|
|
(let ((map (list 'keymap map1 map2))
|
|
|
|
|
(item (if (keymapp val1) (if (keymapp val2) nil val2) val1)))
|
|
|
|
|
(keymap--menu-item-with-binding item map)))))
|
|
|
|
|
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(defun keymap-canonicalize (map)
|
2011-07-02 04:27:41 +00:00
|
|
|
|
"Return a simpler equivalent keymap.
|
|
|
|
|
This resolves inheritance and redefinitions. The returned keymap
|
|
|
|
|
should behave identically to a copy of KEYMAP w.r.t `lookup-key'
|
|
|
|
|
and use in active keymaps and menus.
|
|
|
|
|
Subkeymaps may be modified but are not canonicalized."
|
|
|
|
|
;; FIXME: Problem with the difference between a nil binding
|
|
|
|
|
;; that hides a binding in an inherited map and a nil binding that's ignored
|
|
|
|
|
;; to let some further binding visible. Currently a nil binding hides all.
|
|
|
|
|
;; FIXME: we may want to carefully (re)order elements in case they're
|
|
|
|
|
;; menu-entries.
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(let ((bindings ())
|
2008-12-26 16:49:30 +00:00
|
|
|
|
(ranges ())
|
|
|
|
|
(prompt (keymap-prompt map)))
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(while (keymapp map)
|
2011-07-02 04:27:41 +00:00
|
|
|
|
(setq map (map-keymap ;; -internal
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(lambda (key item)
|
|
|
|
|
(if (consp key)
|
|
|
|
|
;; Treat char-ranges specially.
|
|
|
|
|
(push (cons key item) ranges)
|
|
|
|
|
(push (cons key item) bindings)))
|
|
|
|
|
map)))
|
2011-07-02 04:27:41 +00:00
|
|
|
|
;; Create the new map.
|
2008-12-26 16:49:30 +00:00
|
|
|
|
(setq map (funcall (if ranges 'make-keymap 'make-sparse-keymap) prompt))
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(dolist (binding ranges)
|
2011-07-02 04:27:41 +00:00
|
|
|
|
;; Treat char-ranges specially. FIXME: need to merge as well.
|
2008-04-05 20:00:23 +00:00
|
|
|
|
(define-key map (vector (car binding)) (cdr binding)))
|
2011-07-02 04:27:41 +00:00
|
|
|
|
;; Process the bindings starting from the end.
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(dolist (binding (prog1 bindings (setq bindings ())))
|
|
|
|
|
(let* ((key (car binding))
|
|
|
|
|
(oldbind (assq key bindings)))
|
2011-07-02 04:27:41 +00:00
|
|
|
|
(push (if (not oldbind)
|
|
|
|
|
;; The normal case: no duplicate bindings.
|
|
|
|
|
binding
|
|
|
|
|
;; This is the second binding for this key.
|
|
|
|
|
(setq bindings (delq oldbind bindings))
|
|
|
|
|
(cons key (keymap--merge-bindings (cdr binding)
|
|
|
|
|
(cdr oldbind))))
|
|
|
|
|
bindings)))
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(nconc map bindings)))
|
|
|
|
|
|
1996-08-21 20:36:30 +00:00
|
|
|
|
(put 'keyboard-translate-table 'char-table-extra-slots 0)
|
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
(defun keyboard-translate (from to)
|
2012-07-18 13:31:16 +00:00
|
|
|
|
"Translate character FROM to TO on the current terminal.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
This function creates a `keyboard-translate-table' if necessary
|
|
|
|
|
and then modifies one entry in it."
|
1996-08-21 20:36:30 +00:00
|
|
|
|
(or (char-table-p keyboard-translate-table)
|
|
|
|
|
(setq keyboard-translate-table
|
|
|
|
|
(make-char-table 'keyboard-translate-table nil)))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
(aset keyboard-translate-table from to))
|
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Key binding commands.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun global-set-key (key command)
|
|
|
|
|
"Give KEY a global binding as COMMAND.
|
|
|
|
|
COMMAND is the command definition to use; usually it is
|
|
|
|
|
a symbol naming an interactively-callable function.
|
|
|
|
|
KEY is a key sequence; noninteractively, it is a string or vector
|
|
|
|
|
of characters or event types, and non-ASCII characters with codes
|
|
|
|
|
above 127 (such as ISO Latin-1) can be included if you use a vector.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
Note that if KEY has a local binding in the current buffer,
|
|
|
|
|
that local binding will continue to shadow any global binding
|
|
|
|
|
that you make with this function."
|
|
|
|
|
(interactive "KSet key globally: \nCSet key %s to command: ")
|
|
|
|
|
(or (vectorp key) (stringp key)
|
|
|
|
|
(signal 'wrong-type-argument (list 'arrayp key)))
|
|
|
|
|
(define-key (current-global-map) key command))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun local-set-key (key command)
|
|
|
|
|
"Give KEY a local binding as COMMAND.
|
|
|
|
|
COMMAND is the command definition to use; usually it is
|
|
|
|
|
a symbol naming an interactively-callable function.
|
|
|
|
|
KEY is a key sequence; noninteractively, it is a string or vector
|
|
|
|
|
of characters or event types, and non-ASCII characters with codes
|
|
|
|
|
above 127 (such as ISO Latin-1) can be included if you use a vector.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2013-06-11 16:51:12 +00:00
|
|
|
|
The binding goes in the current buffer's local map, which in most
|
|
|
|
|
cases is shared with all other buffers in the same major mode."
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(interactive "KSet key locally: \nCSet key %s locally to command: ")
|
|
|
|
|
(let ((map (current-local-map)))
|
|
|
|
|
(or map
|
|
|
|
|
(use-local-map (setq map (make-sparse-keymap))))
|
|
|
|
|
(or (vectorp key) (stringp key)
|
|
|
|
|
(signal 'wrong-type-argument (list 'arrayp key)))
|
|
|
|
|
(define-key map key command)))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun global-unset-key (key)
|
|
|
|
|
"Remove global binding of KEY.
|
|
|
|
|
KEY is a string or vector representing a sequence of keystrokes."
|
|
|
|
|
(interactive "kUnset key globally: ")
|
|
|
|
|
(global-set-key key nil))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun local-unset-key (key)
|
|
|
|
|
"Remove local binding of KEY.
|
|
|
|
|
KEY is a string or vector representing a sequence of keystrokes."
|
|
|
|
|
(interactive "kUnset key locally: ")
|
|
|
|
|
(if (current-local-map)
|
|
|
|
|
(local-set-key key nil))
|
|
|
|
|
nil)
|
|
|
|
|
|
|
|
|
|
;;;; substitute-key-definition and its subroutines.
|
|
|
|
|
|
|
|
|
|
(defvar key-substitution-in-progress nil
|
2007-04-09 23:10:00 +00:00
|
|
|
|
"Used internally by `substitute-key-definition'.")
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
(defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix)
|
|
|
|
|
"Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
|
|
|
|
|
In other words, OLDDEF is replaced with NEWDEF where ever it appears.
|
|
|
|
|
Alternatively, if optional fourth argument OLDMAP is specified, we redefine
|
|
|
|
|
in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP.
|
|
|
|
|
|
2006-02-12 20:32:18 +00:00
|
|
|
|
If you don't specify OLDMAP, you can usually get the same results
|
|
|
|
|
in a cleaner way with command remapping, like this:
|
2013-06-11 16:51:12 +00:00
|
|
|
|
(define-key KEYMAP [remap OLDDEF] NEWDEF)
|
2006-02-13 11:05:37 +00:00
|
|
|
|
\n(fn OLDDEF NEWDEF KEYMAP &optional OLDMAP)"
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;; Don't document PREFIX in the doc string because we don't want to
|
|
|
|
|
;; advertise it. It's meant for recursive calls only. Here's its
|
|
|
|
|
;; meaning
|
|
|
|
|
|
|
|
|
|
;; If optional argument PREFIX is specified, it should be a key
|
|
|
|
|
;; prefix, a string. Redefined bindings will then be bound to the
|
|
|
|
|
;; original key, with PREFIX added at the front.
|
|
|
|
|
(or prefix (setq prefix ""))
|
|
|
|
|
(let* ((scan (or oldmap keymap))
|
|
|
|
|
(prefix1 (vconcat prefix [nil]))
|
|
|
|
|
(key-substitution-in-progress
|
|
|
|
|
(cons scan key-substitution-in-progress)))
|
|
|
|
|
;; Scan OLDMAP, finding each char or event-symbol that
|
|
|
|
|
;; has any definition, and act on it with hack-key.
|
|
|
|
|
(map-keymap
|
|
|
|
|
(lambda (char defn)
|
|
|
|
|
(aset prefix1 (length prefix) char)
|
|
|
|
|
(substitute-key-definition-key defn olddef newdef prefix1 keymap))
|
|
|
|
|
scan)))
|
|
|
|
|
|
|
|
|
|
(defun substitute-key-definition-key (defn olddef newdef prefix keymap)
|
|
|
|
|
(let (inner-def skipped menu-item)
|
|
|
|
|
;; Find the actual command name within the binding.
|
|
|
|
|
(if (eq (car-safe defn) 'menu-item)
|
|
|
|
|
(setq menu-item defn defn (nth 2 defn))
|
|
|
|
|
;; Skip past menu-prompt.
|
|
|
|
|
(while (stringp (car-safe defn))
|
|
|
|
|
(push (pop defn) skipped))
|
|
|
|
|
;; Skip past cached key-equivalence data for menu items.
|
|
|
|
|
(if (consp (car-safe defn))
|
|
|
|
|
(setq defn (cdr defn))))
|
|
|
|
|
(if (or (eq defn olddef)
|
|
|
|
|
;; Compare with equal if definition is a key sequence.
|
|
|
|
|
;; That is useful for operating on function-key-map.
|
|
|
|
|
(and (or (stringp defn) (vectorp defn))
|
|
|
|
|
(equal defn olddef)))
|
|
|
|
|
(define-key keymap prefix
|
|
|
|
|
(if menu-item
|
|
|
|
|
(let ((copy (copy-sequence menu-item)))
|
|
|
|
|
(setcar (nthcdr 2 copy) newdef)
|
|
|
|
|
copy)
|
|
|
|
|
(nconc (nreverse skipped) newdef)))
|
|
|
|
|
;; Look past a symbol that names a keymap.
|
|
|
|
|
(setq inner-def
|
2006-02-10 00:02:47 +00:00
|
|
|
|
(or (indirect-function defn t) defn))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;; For nested keymaps, we use `inner-def' rather than `defn' so as to
|
|
|
|
|
;; avoid autoloading a keymap. This is mostly done to preserve the
|
|
|
|
|
;; original non-autoloading behavior of pre-map-keymap times.
|
|
|
|
|
(if (and (keymapp inner-def)
|
|
|
|
|
;; Avoid recursively scanning
|
|
|
|
|
;; where KEYMAP does not have a submap.
|
|
|
|
|
(let ((elt (lookup-key keymap prefix)))
|
|
|
|
|
(or (null elt) (natnump elt) (keymapp elt)))
|
|
|
|
|
;; Avoid recursively rescanning keymap being scanned.
|
|
|
|
|
(not (memq inner-def key-substitution-in-progress)))
|
|
|
|
|
;; If this one isn't being scanned already, scan it now.
|
|
|
|
|
(substitute-key-definition olddef newdef keymap inner-def prefix)))))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
|
|
|
|
|
2002-10-17 15:42:10 +00:00
|
|
|
|
;;;; The global keymap tree.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2009-09-17 15:58:35 +00:00
|
|
|
|
;; global-map, esc-map, and ctl-x-map have their values set up in
|
|
|
|
|
;; keymap.c; we just give them docstrings here.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
|
|
|
|
(defvar global-map nil
|
|
|
|
|
"Default global keymap mapping Emacs keyboard input into commands.
|
|
|
|
|
The value is a keymap which is usually (but not necessarily) Emacs's
|
|
|
|
|
global map.")
|
|
|
|
|
|
|
|
|
|
(defvar esc-map nil
|
|
|
|
|
"Default keymap for ESC (meta) commands.
|
|
|
|
|
The normal global definition of the character ESC indirects to this keymap.")
|
|
|
|
|
|
|
|
|
|
(defvar ctl-x-map nil
|
|
|
|
|
"Default keymap for C-x commands.
|
|
|
|
|
The normal global definition of the character C-x indirects to this keymap.")
|
|
|
|
|
|
|
|
|
|
(defvar ctl-x-4-map (make-sparse-keymap)
|
2001-12-11 07:34:39 +00:00
|
|
|
|
"Keymap for subcommands of C-x 4.")
|
1993-04-23 06:50:48 +00:00
|
|
|
|
(defalias 'ctl-x-4-prefix ctl-x-4-map)
|
1993-04-10 06:21:55 +00:00
|
|
|
|
(define-key ctl-x-map "4" 'ctl-x-4-prefix)
|
|
|
|
|
|
|
|
|
|
(defvar ctl-x-5-map (make-sparse-keymap)
|
|
|
|
|
"Keymap for frame commands.")
|
1993-04-23 06:50:48 +00:00
|
|
|
|
(defalias 'ctl-x-5-prefix ctl-x-5-map)
|
1993-04-10 06:21:55 +00:00
|
|
|
|
(define-key ctl-x-map "5" 'ctl-x-5-prefix)
|
|
|
|
|
|
1993-03-08 08:10:13 +00:00
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
;;;; Event manipulation functions.
|
|
|
|
|
|
2009-08-19 03:03:05 +00:00
|
|
|
|
(defconst listify-key-sequence-1 (logior 128 ?\M-\C-@))
|
1993-05-27 00:06:08 +00:00
|
|
|
|
|
1993-03-06 05:54:29 +00:00
|
|
|
|
(defun listify-key-sequence (key)
|
|
|
|
|
"Convert a key sequence to a list of events."
|
|
|
|
|
(if (vectorp key)
|
|
|
|
|
(append key nil)
|
|
|
|
|
(mapcar (function (lambda (c)
|
|
|
|
|
(if (> c 127)
|
1993-05-27 00:06:08 +00:00
|
|
|
|
(logxor c listify-key-sequence-1)
|
1993-03-06 05:54:29 +00:00
|
|
|
|
c)))
|
2003-05-17 22:00:40 +00:00
|
|
|
|
key)))
|
1993-03-06 05:54:29 +00:00
|
|
|
|
|
2012-08-10 14:47:12 +00:00
|
|
|
|
(defun eventp (obj)
|
1993-03-07 07:35:57 +00:00
|
|
|
|
"True if the argument is an event object."
|
2012-08-10 14:47:12 +00:00
|
|
|
|
(when obj
|
|
|
|
|
(or (integerp obj)
|
|
|
|
|
(and (symbolp obj) obj (not (keywordp obj)))
|
|
|
|
|
(and (consp obj) (symbolp (car obj))))))
|
1993-03-07 07:35:57 +00:00
|
|
|
|
|
|
|
|
|
(defun event-modifiers (event)
|
2004-07-25 05:45:53 +00:00
|
|
|
|
"Return a list of symbols representing the modifier keys in event EVENT.
|
1993-03-07 07:35:57 +00:00
|
|
|
|
The elements of the list may include `meta', `control',
|
1993-08-02 07:23:07 +00:00
|
|
|
|
`shift', `hyper', `super', `alt', `click', `double', `triple', `drag',
|
2004-07-31 15:45:30 +00:00
|
|
|
|
and `down'.
|
|
|
|
|
EVENT may be an event or an event type. If EVENT is a symbol
|
|
|
|
|
that has never been used in an event that has been read as input
|
2011-08-30 14:50:02 +00:00
|
|
|
|
in the current Emacs session, then this function may fail to include
|
|
|
|
|
the `click' modifier."
|
1993-03-07 07:35:57 +00:00
|
|
|
|
(let ((type event))
|
|
|
|
|
(if (listp type)
|
|
|
|
|
(setq type (car type)))
|
|
|
|
|
(if (symbolp type)
|
2007-11-15 16:03:00 +00:00
|
|
|
|
;; Don't read event-symbol-elements directly since we're not
|
|
|
|
|
;; sure the symbol has already been parsed.
|
|
|
|
|
(cdr (internal-event-symbol-parse-modifiers type))
|
2004-04-20 20:56:32 +00:00
|
|
|
|
(let ((list nil)
|
|
|
|
|
(char (logand type (lognot (logior ?\M-\^@ ?\C-\^@ ?\S-\^@
|
|
|
|
|
?\H-\^@ ?\s-\^@ ?\A-\^@)))))
|
|
|
|
|
(if (not (zerop (logand type ?\M-\^@)))
|
2004-10-13 17:05:55 +00:00
|
|
|
|
(push 'meta list))
|
2004-04-20 20:56:32 +00:00
|
|
|
|
(if (or (not (zerop (logand type ?\C-\^@)))
|
|
|
|
|
(< char 32))
|
2004-10-13 17:05:55 +00:00
|
|
|
|
(push 'control list))
|
2004-04-20 20:56:32 +00:00
|
|
|
|
(if (or (not (zerop (logand type ?\S-\^@)))
|
|
|
|
|
(/= char (downcase char)))
|
2004-10-13 17:05:55 +00:00
|
|
|
|
(push 'shift list))
|
1995-02-08 03:51:58 +00:00
|
|
|
|
(or (zerop (logand type ?\H-\^@))
|
2004-10-13 17:05:55 +00:00
|
|
|
|
(push 'hyper list))
|
1995-02-08 03:51:58 +00:00
|
|
|
|
(or (zerop (logand type ?\s-\^@))
|
2004-10-13 17:05:55 +00:00
|
|
|
|
(push 'super list))
|
1995-02-08 03:51:58 +00:00
|
|
|
|
(or (zerop (logand type ?\A-\^@))
|
2004-10-13 17:05:55 +00:00
|
|
|
|
(push 'alt list))
|
1993-03-07 07:35:57 +00:00
|
|
|
|
list))))
|
|
|
|
|
|
1993-03-08 00:07:53 +00:00
|
|
|
|
(defun event-basic-type (event)
|
2004-07-25 05:45:53 +00:00
|
|
|
|
"Return the basic type of the given event (all modifiers removed).
|
2004-07-31 15:45:30 +00:00
|
|
|
|
The value is a printing character (not upper case) or a symbol.
|
|
|
|
|
EVENT may be an event or an event type. If EVENT is a symbol
|
|
|
|
|
that has never been used in an event that has been read as input
|
|
|
|
|
in the current Emacs session, then this function may return nil."
|
1993-06-17 00:16:29 +00:00
|
|
|
|
(if (consp event)
|
|
|
|
|
(setq event (car event)))
|
1993-03-08 00:07:53 +00:00
|
|
|
|
(if (symbolp event)
|
|
|
|
|
(car (get event 'event-symbol-elements))
|
2005-05-19 15:43:48 +00:00
|
|
|
|
(let* ((base (logand event (1- ?\A-\^@)))
|
|
|
|
|
(uncontrolled (if (< base 32) (logior base 64) base)))
|
|
|
|
|
;; There are some numbers that are invalid characters and
|
|
|
|
|
;; cause `downcase' to get an error.
|
|
|
|
|
(condition-case ()
|
|
|
|
|
(downcase uncontrolled)
|
|
|
|
|
(error uncontrolled)))))
|
1993-03-08 00:07:53 +00:00
|
|
|
|
|
1993-03-08 08:10:13 +00:00
|
|
|
|
(defsubst mouse-movement-p (object)
|
|
|
|
|
"Return non-nil if OBJECT is a mouse movement event."
|
2004-10-13 17:05:55 +00:00
|
|
|
|
(eq (car-safe object) 'mouse-movement))
|
1993-03-08 08:10:13 +00:00
|
|
|
|
|
2008-05-02 14:37:39 +00:00
|
|
|
|
(defun mouse-event-p (object)
|
|
|
|
|
"Return non-nil if OBJECT is a mouse click event."
|
|
|
|
|
;; is this really correct? maybe remove mouse-movement?
|
|
|
|
|
(memq (event-basic-type object) '(mouse-1 mouse-2 mouse-3 mouse-movement)))
|
|
|
|
|
|
2012-08-10 14:47:12 +00:00
|
|
|
|
(defun event-start (event)
|
1993-03-08 08:10:13 +00:00
|
|
|
|
"Return the starting position of EVENT.
|
2014-02-10 06:56:03 +00:00
|
|
|
|
EVENT should be a mouse click, drag, or key press event. If
|
|
|
|
|
EVENT is nil, the value of `posn-at-point' is used instead.
|
2014-02-09 02:13:23 +00:00
|
|
|
|
|
|
|
|
|
The following accessor functions are used to access the elements
|
|
|
|
|
of the position:
|
|
|
|
|
|
|
|
|
|
`posn-window': The window the event is in.
|
|
|
|
|
`posn-area': A symbol identifying the area the event occurred in,
|
|
|
|
|
or nil if the event occurred in the text area.
|
|
|
|
|
`posn-point': The buffer position of the event.
|
2014-02-12 19:40:35 +00:00
|
|
|
|
`posn-x-y': The pixel-based coordinates of the event.
|
2014-02-09 02:13:23 +00:00
|
|
|
|
`posn-col-row': The estimated column and row corresponding to the
|
|
|
|
|
position of the event.
|
|
|
|
|
`posn-actual-col-row': The actual column and row corresponding to the
|
|
|
|
|
position of the event.
|
|
|
|
|
`posn-string': The string object of the event, which is either
|
|
|
|
|
nil or (STRING . POSITION)'.
|
|
|
|
|
`posn-image': The image object of the event, if any.
|
|
|
|
|
`posn-object': The image or string object of the event, if any.
|
|
|
|
|
`posn-timestamp': The time the event occurred, in milliseconds.
|
|
|
|
|
|
|
|
|
|
For more information, see Info node `(elisp)Click Events'."
|
2002-06-23 22:13:15 +00:00
|
|
|
|
(if (consp event) (nth 1 event)
|
2012-08-10 14:47:12 +00:00
|
|
|
|
(or (posn-at-point)
|
|
|
|
|
(list (selected-window) (point) '(0 . 0) 0))))
|
1993-03-08 08:10:13 +00:00
|
|
|
|
|
2012-08-10 14:47:12 +00:00
|
|
|
|
(defun event-end (event)
|
2014-02-09 02:13:23 +00:00
|
|
|
|
"Return the ending position of EVENT.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
EVENT should be a click, drag, or key press event.
|
2014-02-09 02:13:23 +00:00
|
|
|
|
|
|
|
|
|
See `event-start' for a description of the value returned."
|
2002-06-23 22:13:15 +00:00
|
|
|
|
(if (consp event) (nth (if (consp (nth 2 event)) 2 1) event)
|
2012-08-10 14:47:12 +00:00
|
|
|
|
(or (posn-at-point)
|
|
|
|
|
(list (selected-window) (point) '(0 . 0) 0))))
|
1993-03-08 08:10:13 +00:00
|
|
|
|
|
1993-08-02 07:23:07 +00:00
|
|
|
|
(defsubst event-click-count (event)
|
|
|
|
|
"Return the multi-click count of EVENT, a click or drag event.
|
|
|
|
|
The return value is a positive integer."
|
2002-06-23 22:13:15 +00:00
|
|
|
|
(if (and (consp event) (integerp (nth 2 event))) (nth 2 event) 1))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
;;;; Extracting fields of the positions in an event.
|
1993-08-02 07:23:07 +00:00
|
|
|
|
|
2012-08-10 14:47:12 +00:00
|
|
|
|
(defun posnp (obj)
|
|
|
|
|
"Return non-nil if OBJ appears to be a valid `posn' object."
|
|
|
|
|
(and (windowp (car-safe obj))
|
|
|
|
|
(atom (car-safe (setq obj (cdr obj)))) ;AREA-OR-POS.
|
|
|
|
|
(integerp (car-safe (car-safe (setq obj (cdr obj))))) ;XOFFSET.
|
|
|
|
|
(integerp (car-safe (cdr obj))))) ;TIMESTAMP.
|
|
|
|
|
|
1993-03-08 08:10:13 +00:00
|
|
|
|
(defsubst posn-window (position)
|
|
|
|
|
"Return the window in POSITION.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
POSITION should be a list of the form returned by the `event-start'
|
|
|
|
|
and `event-end' functions."
|
1993-03-08 08:10:13 +00:00
|
|
|
|
(nth 0 position))
|
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(defsubst posn-area (position)
|
|
|
|
|
"Return the window area recorded in POSITION, or nil for the text area.
|
|
|
|
|
POSITION should be a list of the form returned by the `event-start'
|
|
|
|
|
and `event-end' functions."
|
|
|
|
|
(let ((area (if (consp (nth 1 position))
|
|
|
|
|
(car (nth 1 position))
|
|
|
|
|
(nth 1 position))))
|
|
|
|
|
(and (symbolp area) area)))
|
|
|
|
|
|
2013-03-20 18:13:00 +00:00
|
|
|
|
(defun posn-point (position)
|
1993-03-08 08:10:13 +00:00
|
|
|
|
"Return the buffer location in POSITION.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
POSITION should be a list of the form returned by the `event-start'
|
2013-03-20 18:13:00 +00:00
|
|
|
|
and `event-end' functions.
|
|
|
|
|
Returns nil if POSITION does not correspond to any buffer location (e.g.
|
|
|
|
|
a click on a scroll bar)."
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(or (nth 5 position)
|
2013-03-20 18:13:00 +00:00
|
|
|
|
(let ((pt (nth 1 position)))
|
|
|
|
|
(or (car-safe pt)
|
|
|
|
|
;; Apparently this can also be `vertical-scroll-bar' (bug#13979).
|
|
|
|
|
(if (integerp pt) pt)))))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
|
|
|
|
(defun posn-set-point (position)
|
|
|
|
|
"Move point to POSITION.
|
|
|
|
|
Select the corresponding window as well."
|
2007-04-09 23:10:00 +00:00
|
|
|
|
(if (not (windowp (posn-window position)))
|
|
|
|
|
(error "Position not in text area of window"))
|
|
|
|
|
(select-window (posn-window position))
|
|
|
|
|
(if (numberp (posn-point position))
|
|
|
|
|
(goto-char (posn-point position))))
|
1993-03-08 08:10:13 +00:00
|
|
|
|
|
1994-02-23 05:08:28 +00:00
|
|
|
|
(defsubst posn-x-y (position)
|
|
|
|
|
"Return the x and y coordinates in POSITION.
|
2010-12-05 00:43:18 +00:00
|
|
|
|
The return value has the form (X . Y), where X and Y are given in
|
|
|
|
|
pixels. POSITION should be a list of the form returned by
|
|
|
|
|
`event-start' and `event-end'."
|
1993-03-08 08:10:13 +00:00
|
|
|
|
(nth 2 position))
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function scroll-bar-scale "scroll-bar" (num-denom whole))
|
|
|
|
|
|
1994-05-22 20:55:15 +00:00
|
|
|
|
(defun posn-col-row (position)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
"Return the nominal column and row in POSITION, measured in characters.
|
|
|
|
|
The column and row values are approximations calculated from the x
|
|
|
|
|
and y coordinates in POSITION and the frame's default character width
|
|
|
|
|
and height.
|
1994-05-22 20:55:15 +00:00
|
|
|
|
For a scroll-bar event, the result column is 0, and the row
|
2004-04-16 12:51:06 +00:00
|
|
|
|
corresponds to the vertical position of the click in the scroll bar.
|
|
|
|
|
POSITION should be a list of the form returned by the `event-start'
|
|
|
|
|
and `event-end' functions."
|
|
|
|
|
(let* ((pair (posn-x-y position))
|
|
|
|
|
(window (posn-window position))
|
|
|
|
|
(area (posn-area position)))
|
|
|
|
|
(cond
|
|
|
|
|
((null window)
|
|
|
|
|
'(0 . 0))
|
|
|
|
|
((eq area 'vertical-scroll-bar)
|
|
|
|
|
(cons 0 (scroll-bar-scale pair (1- (window-height window)))))
|
|
|
|
|
((eq area 'horizontal-scroll-bar)
|
|
|
|
|
(cons (scroll-bar-scale pair (window-width window)) 0))
|
|
|
|
|
(t
|
|
|
|
|
(let* ((frame (if (framep window) window (window-frame window)))
|
2009-04-15 22:41:20 +00:00
|
|
|
|
;; FIXME: This should take line-spacing properties on
|
|
|
|
|
;; newlines into account.
|
|
|
|
|
(spacing (when (display-graphic-p frame)
|
|
|
|
|
(or (with-current-buffer (window-buffer window)
|
|
|
|
|
line-spacing)
|
|
|
|
|
(frame-parameter frame 'line-spacing)))))
|
|
|
|
|
(cond ((floatp spacing)
|
|
|
|
|
(setq spacing (truncate (* spacing
|
|
|
|
|
(frame-char-height frame)))))
|
|
|
|
|
((null spacing)
|
|
|
|
|
(setq spacing 0)))
|
|
|
|
|
(cons (/ (car pair) (frame-char-width frame))
|
2010-11-13 21:07:58 +00:00
|
|
|
|
(- (/ (cdr pair) (+ (frame-char-height frame) spacing))
|
2010-12-12 20:45:57 +00:00
|
|
|
|
(if (null (with-current-buffer (window-buffer window)
|
|
|
|
|
header-line-format))
|
|
|
|
|
0 1))))))))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
|
|
|
|
(defun posn-actual-col-row (position)
|
|
|
|
|
"Return the actual column and row in POSITION, measured in characters.
|
|
|
|
|
These are the actual row number in the window and character number in that row.
|
|
|
|
|
Return nil if POSITION does not contain the actual position; in that case
|
|
|
|
|
`posn-col-row' can be used to get approximate values.
|
|
|
|
|
POSITION should be a list of the form returned by the `event-start'
|
|
|
|
|
and `event-end' functions."
|
|
|
|
|
(nth 6 position))
|
1994-02-23 05:08:28 +00:00
|
|
|
|
|
1993-03-08 08:10:13 +00:00
|
|
|
|
(defsubst posn-timestamp (position)
|
|
|
|
|
"Return the timestamp of POSITION.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
POSITION should be a list of the form returned by the `event-start'
|
|
|
|
|
and `event-end' functions."
|
1993-03-08 08:10:13 +00:00
|
|
|
|
(nth 3 position))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2013-03-20 18:13:00 +00:00
|
|
|
|
(defun posn-string (position)
|
2006-04-26 08:56:32 +00:00
|
|
|
|
"Return the string object of POSITION.
|
|
|
|
|
Value is a cons (STRING . STRING-POS), or nil if not a string.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
POSITION should be a list of the form returned by the `event-start'
|
|
|
|
|
and `event-end' functions."
|
2013-03-20 18:13:00 +00:00
|
|
|
|
(let ((x (nth 4 position)))
|
|
|
|
|
;; Apparently this can also be `handle' or `below-handle' (bug#13979).
|
|
|
|
|
(when (consp x) x)))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
|
|
|
|
(defsubst posn-image (position)
|
2006-04-26 08:56:32 +00:00
|
|
|
|
"Return the image object of POSITION.
|
2006-11-19 23:42:37 +00:00
|
|
|
|
Value is a list (image ...), or nil if not an image.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
POSITION should be a list of the form returned by the `event-start'
|
|
|
|
|
and `event-end' functions."
|
|
|
|
|
(nth 7 position))
|
|
|
|
|
|
|
|
|
|
(defsubst posn-object (position)
|
|
|
|
|
"Return the object (image or string) of POSITION.
|
2006-04-26 08:56:32 +00:00
|
|
|
|
Value is a list (image ...) for an image object, a cons cell
|
|
|
|
|
\(STRING . STRING-POS) for a string object, and nil for a buffer position.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
POSITION should be a list of the form returned by the `event-start'
|
|
|
|
|
and `event-end' functions."
|
|
|
|
|
(or (posn-image position) (posn-string position)))
|
|
|
|
|
|
|
|
|
|
(defsubst posn-object-x-y (position)
|
|
|
|
|
"Return the x and y coordinates relative to the object of POSITION.
|
2010-12-05 00:43:18 +00:00
|
|
|
|
The return value has the form (DX . DY), where DX and DY are
|
|
|
|
|
given in pixels. POSITION should be a list of the form returned
|
|
|
|
|
by `event-start' and `event-end'."
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(nth 8 position))
|
|
|
|
|
|
|
|
|
|
(defsubst posn-object-width-height (position)
|
|
|
|
|
"Return the pixel width and height of the object of POSITION.
|
2010-12-05 00:43:18 +00:00
|
|
|
|
The return value has the form (WIDTH . HEIGHT). POSITION should
|
|
|
|
|
be a list of the form returned by `event-start' and `event-end'."
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(nth 9 position))
|
|
|
|
|
|
1990-11-05 10:06:02 +00:00
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
;;;; Obsolescent names for functions.
|
|
|
|
|
|
2009-10-01 17:47:38 +00:00
|
|
|
|
(define-obsolete-function-alias 'window-dot 'window-point "22.1")
|
|
|
|
|
(define-obsolete-function-alias 'set-window-dot 'set-window-point "22.1")
|
|
|
|
|
(define-obsolete-function-alias 'read-input 'read-string "22.1")
|
|
|
|
|
(define-obsolete-function-alias 'show-buffer 'set-window-buffer "22.1")
|
|
|
|
|
(define-obsolete-function-alias 'eval-current-buffer 'eval-buffer "22.1")
|
|
|
|
|
(define-obsolete-function-alias 'string-to-int 'string-to-number "22.1")
|
|
|
|
|
|
|
|
|
|
(make-obsolete 'forward-point "use (+ (point) N) instead." "23.1")
|
2012-08-15 16:29:11 +00:00
|
|
|
|
(make-obsolete 'buffer-has-markers-at nil "24.3")
|
2009-10-01 17:47:38 +00:00
|
|
|
|
|
|
|
|
|
(defun insert-string (&rest args)
|
|
|
|
|
"Mocklisp-compatibility insert function.
|
|
|
|
|
Like the function `insert' except that any argument that is a number
|
|
|
|
|
is converted into a string by expressing it in decimal."
|
Use declare forms, where possible, to mark obsolete functions.
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.
* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.
* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.
* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.
* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.
* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.
* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
* lisp/international/mule-util.el (string-to-sequence): Remove.
* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.
* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.
* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
2012-09-25 04:13:02 +00:00
|
|
|
|
(declare (obsolete insert "22.1"))
|
2009-10-01 17:47:38 +00:00
|
|
|
|
(dolist (el args)
|
|
|
|
|
(insert (if (integerp el) (number-to-string el) el))))
|
|
|
|
|
|
Use declare forms, where possible, to mark obsolete functions.
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.
* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.
* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.
* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.
* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.
* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.
* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
* lisp/international/mule-util.el (string-to-sequence): Remove.
* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.
* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.
* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
2012-09-25 04:13:02 +00:00
|
|
|
|
(defun makehash (&optional test)
|
|
|
|
|
(declare (obsolete make-hash-table "22.1"))
|
|
|
|
|
(make-hash-table :test (or test 'eql)))
|
2009-10-01 17:47:38 +00:00
|
|
|
|
|
2013-06-20 14:15:42 +00:00
|
|
|
|
(defun log10 (x)
|
|
|
|
|
"Return (log X 10), the log base 10 of X."
|
|
|
|
|
(declare (obsolete log "24.4"))
|
|
|
|
|
(log x 10))
|
|
|
|
|
|
2009-10-01 17:47:38 +00:00
|
|
|
|
;; These are used by VM and some old programs
|
|
|
|
|
(defalias 'focus-frame 'ignore "")
|
|
|
|
|
(make-obsolete 'focus-frame "it does nothing." "22.1")
|
|
|
|
|
(defalias 'unfocus-frame 'ignore "")
|
|
|
|
|
(make-obsolete 'unfocus-frame "it does nothing." "22.1")
|
|
|
|
|
(make-obsolete 'make-variable-frame-local
|
|
|
|
|
"explicitly check for a frame-parameter instead." "22.2")
|
2009-10-26 03:39:15 +00:00
|
|
|
|
(set-advertised-calling-convention
|
2010-09-14 11:11:44 +00:00
|
|
|
|
'all-completions '(string collection &optional predicate) "23.1")
|
|
|
|
|
(set-advertised-calling-convention 'unintern '(name obarray) "23.3")
|
2012-08-15 16:29:11 +00:00
|
|
|
|
(set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.3")
|
2013-10-03 04:41:23 +00:00
|
|
|
|
(set-advertised-calling-convention 'decode-char '(ch charset) "21.4")
|
|
|
|
|
(set-advertised-calling-convention 'encode-char '(ch charset) "21.4")
|
2009-10-01 17:47:38 +00:00
|
|
|
|
|
|
|
|
|
;;;; Obsolescence declarations for variables, and aliases.
|
|
|
|
|
|
* subr.el (default-mode-line-format, default-header-line-format)
(default-line-spacing, default-abbrev-mode, default-ctl-arrow)
(default-direction-reversed, default-truncate-lines)
(default-left-margin, default-tab-width, default-case-fold-search)
(default-left-margin-width, default-right-margin-width)
(default-left-fringe-width, default-right-fringe-width)
(default-fringes-outside-margins, default-scroll-bar-width)
(default-vertical-scroll-bar, default-indicate-empty-lines)
(default-indicate-buffer-boundaries, default-fringe-indicator-alist)
(default-fringe-cursor-alist, default-scroll-up-aggressively)
(default-scroll-down-aggressively, default-fill-column)
(default-cursor-type, default-buffer-file-type)
(default-cursor-in-non-selected-windows)
(default-buffer-file-coding-system, default-major-mode)
(default-enable-multibyte-characters): Mark as obsolete.
* cus-start.el (default-major-mode): Customize `major-mode' instead.
(enable-multibyte-characters): Not customizable any more.
2009-08-27 04:24:00 +00:00
|
|
|
|
;; Special "default-FOO" variables which contain the default value of
|
|
|
|
|
;; the "FOO" variable are nasty. Their implementation is brittle, and
|
|
|
|
|
;; slows down several unrelated variable operations; furthermore, they
|
|
|
|
|
;; can lead to really odd behavior if you decide to make them
|
|
|
|
|
;; buffer-local.
|
|
|
|
|
|
|
|
|
|
;; Not used at all in Emacs, last time I checked:
|
|
|
|
|
(make-obsolete-variable 'default-mode-line-format 'mode-line-format "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-header-line-format 'header-line-format "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-line-spacing 'line-spacing "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-abbrev-mode 'abbrev-mode "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-ctl-arrow 'ctl-arrow "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-truncate-lines 'truncate-lines "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-left-margin 'left-margin "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-tab-width 'tab-width "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-case-fold-search 'case-fold-search "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-left-margin-width 'left-margin-width "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-right-margin-width 'right-margin-width "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-left-fringe-width 'left-fringe-width "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-right-fringe-width 'right-fringe-width "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-fringes-outside-margins 'fringes-outside-margins "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-scroll-bar-width 'scroll-bar-width "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-vertical-scroll-bar 'vertical-scroll-bar "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-indicate-empty-lines 'indicate-empty-lines "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-indicate-buffer-boundaries 'indicate-buffer-boundaries "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-fringe-indicator-alist 'fringe-indicator-alist "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-fringe-cursor-alist 'fringe-cursor-alist "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-scroll-up-aggressively 'scroll-up-aggressively "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-scroll-down-aggressively 'scroll-down-aggressively "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-fill-column 'fill-column "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-cursor-type 'cursor-type "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-cursor-in-non-selected-windows 'cursor-in-non-selected-windows "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-buffer-file-coding-system 'buffer-file-coding-system "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-major-mode 'major-mode "23.2")
|
|
|
|
|
(make-obsolete-variable 'default-enable-multibyte-characters
|
|
|
|
|
"use enable-multibyte-characters or set-buffer-multibyte instead" "23.2")
|
|
|
|
|
|
2009-09-10 18:19:03 +00:00
|
|
|
|
(make-obsolete-variable 'define-key-rebound-commands nil "23.2")
|
2008-03-25 17:32:20 +00:00
|
|
|
|
(make-obsolete-variable 'redisplay-end-trigger-functions 'jit-lock-register "23.1")
|
2011-03-21 16:34:16 +00:00
|
|
|
|
(make-obsolete-variable 'deferred-action-list 'post-command-hook "24.1")
|
|
|
|
|
(make-obsolete-variable 'deferred-action-function 'post-command-hook "24.1")
|
2008-03-25 17:32:20 +00:00
|
|
|
|
(make-obsolete 'window-redisplay-end-trigger nil "23.1")
|
|
|
|
|
(make-obsolete 'set-window-redisplay-end-trigger nil "23.1")
|
|
|
|
|
|
|
|
|
|
(make-obsolete 'process-filter-multibyte-p nil "23.1")
|
|
|
|
|
(make-obsolete 'set-process-filter-multibyte nil "23.1")
|
|
|
|
|
|
2005-05-02 02:20:28 +00:00
|
|
|
|
;; Lisp manual only updated in 22.1.
|
|
|
|
|
(define-obsolete-variable-alias 'executing-macro 'executing-kbd-macro
|
2007-04-09 23:10:00 +00:00
|
|
|
|
"before 19.34")
|
2005-05-02 02:20:28 +00:00
|
|
|
|
|
2012-10-23 15:06:07 +00:00
|
|
|
|
(define-obsolete-variable-alias 'x-lost-selection-hooks
|
|
|
|
|
'x-lost-selection-functions "22.1")
|
|
|
|
|
(define-obsolete-variable-alias 'x-sent-selection-hooks
|
|
|
|
|
'x-sent-selection-functions "22.1")
|
2004-12-27 16:23:34 +00:00
|
|
|
|
|
2009-02-14 09:08:08 +00:00
|
|
|
|
;; This was introduced in 21.4 for pre-unicode unification. That
|
|
|
|
|
;; usage was rendered obsolete in 23.1 which uses Unicode internally.
|
|
|
|
|
;; Other uses are possible, so this variable is not _really_ obsolete,
|
|
|
|
|
;; but Stefan insists to mark it so.
|
|
|
|
|
(make-obsolete-variable 'translation-table-for-input nil "23.1")
|
|
|
|
|
|
2004-12-27 16:23:34 +00:00
|
|
|
|
(defvaralias 'messages-buffer-max-lines 'message-log-max)
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
|
|
|
|
;;;; Alternate names for functions - these are not being phased out.
|
|
|
|
|
|
2005-05-19 23:45:09 +00:00
|
|
|
|
(defalias 'send-string 'process-send-string)
|
|
|
|
|
(defalias 'send-region 'process-send-region)
|
1993-04-23 06:50:48 +00:00
|
|
|
|
(defalias 'string= 'string-equal)
|
|
|
|
|
(defalias 'string< 'string-lessp)
|
|
|
|
|
(defalias 'move-marker 'set-marker)
|
|
|
|
|
(defalias 'rplaca 'setcar)
|
|
|
|
|
(defalias 'rplacd 'setcdr)
|
1993-06-09 11:59:12 +00:00
|
|
|
|
(defalias 'beep 'ding) ;preserve lingual purity
|
1993-04-23 06:50:48 +00:00
|
|
|
|
(defalias 'indent-to-column 'indent-to)
|
|
|
|
|
(defalias 'backward-delete-char 'delete-backward-char)
|
|
|
|
|
(defalias 'search-forward-regexp (symbol-function 're-search-forward))
|
|
|
|
|
(defalias 'search-backward-regexp (symbol-function 're-search-backward))
|
|
|
|
|
(defalias 'int-to-string 'number-to-string)
|
1998-03-14 08:15:36 +00:00
|
|
|
|
(defalias 'store-match-data 'set-match-data)
|
2008-12-24 18:27:30 +00:00
|
|
|
|
(defalias 'chmod 'set-file-modes)
|
2008-12-29 05:11:15 +00:00
|
|
|
|
(defalias 'mkdir 'make-directory)
|
2000-09-12 12:56:25 +00:00
|
|
|
|
;; These are the XEmacs names:
|
1999-08-16 20:57:24 +00:00
|
|
|
|
(defalias 'point-at-eol 'line-end-position)
|
|
|
|
|
(defalias 'point-at-bol 'line-beginning-position)
|
1993-02-22 14:16:25 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defalias 'user-original-login-name 'user-login-name)
|
|
|
|
|
|
1990-11-05 10:06:02 +00:00
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
;;;; Hook manipulation functions.
|
1990-11-05 10:06:02 +00:00
|
|
|
|
|
1994-09-30 20:47:13 +00:00
|
|
|
|
(defun add-hook (hook function &optional append local)
|
1993-08-02 07:23:07 +00:00
|
|
|
|
"Add to the value of HOOK the function FUNCTION.
|
|
|
|
|
FUNCTION is not added if already present.
|
|
|
|
|
FUNCTION is added (if necessary) at the beginning of the hook list
|
|
|
|
|
unless the optional argument APPEND is non-nil, in which case
|
|
|
|
|
FUNCTION is added at the end.
|
|
|
|
|
|
1994-09-30 20:47:13 +00:00
|
|
|
|
The optional fourth argument, LOCAL, if non-nil, says to modify
|
2011-07-13 21:38:56 +00:00
|
|
|
|
the hook's buffer-local value rather than its global value.
|
|
|
|
|
This makes the hook buffer-local, and it makes t a member of the
|
|
|
|
|
buffer-local value. That acts as a flag to run the hook
|
|
|
|
|
functions of the global value as well as in the local value.
|
1994-09-30 20:47:13 +00:00
|
|
|
|
|
1993-08-02 07:23:07 +00:00
|
|
|
|
HOOK should be a symbol, and FUNCTION may be any valid function. If
|
|
|
|
|
HOOK is void, it is first set to nil. If HOOK's value is a single
|
1994-09-21 05:19:43 +00:00
|
|
|
|
function, it is changed to a list of functions."
|
1990-11-05 10:06:02 +00:00
|
|
|
|
(or (boundp hook) (set hook nil))
|
1994-09-30 20:47:13 +00:00
|
|
|
|
(or (default-boundp hook) (set-default hook nil))
|
2001-10-05 09:26:17 +00:00
|
|
|
|
(if local (unless (local-variable-if-set-p hook)
|
|
|
|
|
(set (make-local-variable hook) (list t)))
|
2000-05-10 22:40:17 +00:00
|
|
|
|
;; Detect the case where make-local-variable was used on a hook
|
|
|
|
|
;; and do what we used to do.
|
|
|
|
|
(unless (and (consp (symbol-value hook)) (memq t (symbol-value hook)))
|
|
|
|
|
(setq local t)))
|
|
|
|
|
(let ((hook-value (if local (symbol-value hook) (default-value hook))))
|
|
|
|
|
;; If the hook value is a single function, turn it into a list.
|
2013-09-18 01:27:00 +00:00
|
|
|
|
(when (or (not (listp hook-value)) (functionp hook-value))
|
2000-05-16 14:47:46 +00:00
|
|
|
|
(setq hook-value (list hook-value)))
|
2000-05-10 22:40:17 +00:00
|
|
|
|
;; Do the actual addition if necessary
|
|
|
|
|
(unless (member function hook-value)
|
2009-11-11 06:16:16 +00:00
|
|
|
|
(when (stringp function)
|
|
|
|
|
(setq function (purecopy function)))
|
2000-05-10 22:40:17 +00:00
|
|
|
|
(setq hook-value
|
|
|
|
|
(if append
|
|
|
|
|
(append hook-value (list function))
|
|
|
|
|
(cons function hook-value))))
|
|
|
|
|
;; Set the actual variable
|
2008-01-25 22:51:18 +00:00
|
|
|
|
(if local
|
|
|
|
|
(progn
|
|
|
|
|
;; If HOOK isn't a permanent local,
|
|
|
|
|
;; but FUNCTION wants to survive a change of modes,
|
|
|
|
|
;; mark HOOK as partially permanent.
|
|
|
|
|
(and (symbolp function)
|
|
|
|
|
(get function 'permanent-local-hook)
|
|
|
|
|
(not (get hook 'permanent-local))
|
|
|
|
|
(put hook 'permanent-local 'permanent-local-hook))
|
|
|
|
|
(set hook hook-value))
|
|
|
|
|
(set-default hook hook-value))))
|
1994-09-30 20:47:13 +00:00
|
|
|
|
|
|
|
|
|
(defun remove-hook (hook function &optional local)
|
1993-11-10 20:30:32 +00:00
|
|
|
|
"Remove from the value of HOOK the function FUNCTION.
|
|
|
|
|
HOOK should be a symbol, and FUNCTION may be any valid function. If
|
|
|
|
|
FUNCTION isn't the value of HOOK, or, if FUNCTION doesn't appear in the
|
1994-09-30 20:47:13 +00:00
|
|
|
|
list of hooks to run in HOOK, then nothing is done. See `add-hook'.
|
|
|
|
|
|
|
|
|
|
The optional third argument, LOCAL, if non-nil, says to modify
|
2004-04-16 12:51:06 +00:00
|
|
|
|
the hook's buffer-local value rather than its default value."
|
2000-05-10 22:40:17 +00:00
|
|
|
|
(or (boundp hook) (set hook nil))
|
|
|
|
|
(or (default-boundp hook) (set-default hook nil))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;; Do nothing if LOCAL is t but this hook has no local binding.
|
|
|
|
|
(unless (and local (not (local-variable-p hook)))
|
2000-05-10 22:40:17 +00:00
|
|
|
|
;; Detect the case where make-local-variable was used on a hook
|
|
|
|
|
;; and do what we used to do.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(when (and (local-variable-p hook)
|
|
|
|
|
(not (and (consp (symbol-value hook))
|
|
|
|
|
(memq t (symbol-value hook)))))
|
|
|
|
|
(setq local t))
|
|
|
|
|
(let ((hook-value (if local (symbol-value hook) (default-value hook))))
|
|
|
|
|
;; Remove the function, for both the list and the non-list cases.
|
|
|
|
|
(if (or (not (listp hook-value)) (eq (car hook-value) 'lambda))
|
|
|
|
|
(if (equal hook-value function) (setq hook-value nil))
|
|
|
|
|
(setq hook-value (delete function (copy-sequence hook-value))))
|
|
|
|
|
;; If the function is on the global hook, we need to shadow it locally
|
|
|
|
|
;;(when (and local (member function (default-value hook))
|
|
|
|
|
;; (not (member (cons 'not function) hook-value)))
|
|
|
|
|
;; (push (cons 'not function) hook-value))
|
|
|
|
|
;; Set the actual variable
|
|
|
|
|
(if (not local)
|
|
|
|
|
(set-default hook hook-value)
|
|
|
|
|
(if (equal hook-value '(t))
|
|
|
|
|
(kill-local-variable hook)
|
|
|
|
|
(set hook hook-value))))))
|
1994-10-13 06:34:09 +00:00
|
|
|
|
|
2011-03-11 20:04:22 +00:00
|
|
|
|
(defmacro letrec (binders &rest body)
|
|
|
|
|
"Bind variables according to BINDERS then eval BODY.
|
|
|
|
|
The value of the last form in BODY is returned.
|
|
|
|
|
Each element of BINDERS is a list (SYMBOL VALUEFORM) which binds
|
|
|
|
|
SYMBOL to the value of VALUEFORM.
|
|
|
|
|
All symbols are bound before the VALUEFORMs are evalled."
|
|
|
|
|
;; Only useful in lexical-binding mode.
|
|
|
|
|
;; As a special-form, we could implement it more efficiently (and cleanly,
|
|
|
|
|
;; making the vars actually unbound during evaluation of the binders).
|
|
|
|
|
(declare (debug let) (indent 1))
|
|
|
|
|
`(let ,(mapcar #'car binders)
|
|
|
|
|
,@(mapcar (lambda (binder) `(setq ,@binder)) binders)
|
|
|
|
|
,@body))
|
|
|
|
|
|
2011-10-26 00:44:06 +00:00
|
|
|
|
(defmacro with-wrapper-hook (hook args &rest body)
|
|
|
|
|
"Run BODY, using wrapper functions from HOOK with additional ARGS.
|
|
|
|
|
HOOK is an abnormal hook. Each hook function in HOOK \"wraps\"
|
|
|
|
|
around the preceding ones, like a set of nested `around' advices.
|
|
|
|
|
|
|
|
|
|
Each hook function should accept an argument list consisting of a
|
|
|
|
|
function FUN, followed by the additional arguments in ARGS.
|
|
|
|
|
|
2012-02-04 20:59:54 +00:00
|
|
|
|
The first hook function in HOOK is passed a FUN that, if it is called
|
|
|
|
|
with arguments ARGS, performs BODY (i.e., the default operation).
|
|
|
|
|
The FUN passed to each successive hook function is defined based
|
|
|
|
|
on the preceding hook functions; if called with arguments ARGS,
|
|
|
|
|
it does what the `with-wrapper-hook' call would do if the
|
|
|
|
|
preceding hook functions were the only ones present in HOOK.
|
|
|
|
|
|
|
|
|
|
Each hook function may call its FUN argument as many times as it wishes,
|
|
|
|
|
including never. In that case, such a hook function acts to replace
|
|
|
|
|
the default definition altogether, and any preceding hook functions.
|
|
|
|
|
Of course, a subsequent hook function may do the same thing.
|
|
|
|
|
|
|
|
|
|
Each hook function definition is used to construct the FUN passed
|
2011-10-26 00:44:06 +00:00
|
|
|
|
to the next hook function, if any. The last (or \"outermost\")
|
|
|
|
|
FUN is then called once."
|
2013-04-18 00:12:33 +00:00
|
|
|
|
(declare (indent 2) (debug (form sexp body))
|
2014-03-01 03:54:47 +00:00
|
|
|
|
(obsolete "use a <foo>-function variable modified by `add-function'."
|
2013-04-18 00:12:33 +00:00
|
|
|
|
"24.4"))
|
2011-03-11 20:04:22 +00:00
|
|
|
|
;; We need those two gensyms because CL's lexical scoping is not available
|
|
|
|
|
;; for function arguments :-(
|
|
|
|
|
(let ((funs (make-symbol "funs"))
|
|
|
|
|
(global (make-symbol "global"))
|
|
|
|
|
(argssym (make-symbol "args"))
|
|
|
|
|
(runrestofhook (make-symbol "runrestofhook")))
|
|
|
|
|
;; Since the hook is a wrapper, the loop has to be done via
|
|
|
|
|
;; recursion: a given hook function will call its parameter in order to
|
|
|
|
|
;; continue looping.
|
|
|
|
|
`(letrec ((,runrestofhook
|
|
|
|
|
(lambda (,funs ,global ,argssym)
|
|
|
|
|
;; `funs' holds the functions left on the hook and `global'
|
|
|
|
|
;; holds the functions left on the global part of the hook
|
|
|
|
|
;; (in case the hook is local).
|
|
|
|
|
(if (consp ,funs)
|
|
|
|
|
(if (eq t (car ,funs))
|
|
|
|
|
(funcall ,runrestofhook
|
|
|
|
|
(append ,global (cdr ,funs)) nil ,argssym)
|
|
|
|
|
(apply (car ,funs)
|
|
|
|
|
(apply-partially
|
|
|
|
|
(lambda (,funs ,global &rest ,argssym)
|
|
|
|
|
(funcall ,runrestofhook ,funs ,global ,argssym))
|
|
|
|
|
(cdr ,funs) ,global)
|
|
|
|
|
,argssym))
|
|
|
|
|
;; Once there are no more functions on the hook, run
|
|
|
|
|
;; the original body.
|
|
|
|
|
(apply (lambda ,args ,@body) ,argssym)))))
|
2011-10-26 00:44:06 +00:00
|
|
|
|
(funcall ,runrestofhook ,hook
|
2011-03-11 20:04:22 +00:00
|
|
|
|
;; The global part of the hook, if any.
|
2011-10-26 00:44:06 +00:00
|
|
|
|
,(if (symbolp hook)
|
|
|
|
|
`(if (local-variable-p ',hook)
|
|
|
|
|
(default-value ',hook)))
|
2011-03-11 20:04:22 +00:00
|
|
|
|
(list ,@args)))))
|
|
|
|
|
|
2006-09-10 17:45:42 +00:00
|
|
|
|
(defun add-to-list (list-var element &optional append compare-fn)
|
2005-06-27 21:21:36 +00:00
|
|
|
|
"Add ELEMENT to the value of LIST-VAR if it isn't there yet.
|
2014-02-08 03:37:57 +00:00
|
|
|
|
The test for presence of ELEMENT is done with `equal', or with
|
|
|
|
|
COMPARE-FN if that's non-nil.
|
2000-10-10 02:47:30 +00:00
|
|
|
|
If ELEMENT is added, it is added at the beginning of the list,
|
|
|
|
|
unless the optional argument APPEND is non-nil, in which case
|
|
|
|
|
ELEMENT is added at the end.
|
1999-05-22 19:42:01 +00:00
|
|
|
|
|
2002-03-11 13:31:50 +00:00
|
|
|
|
The return value is the new value of LIST-VAR.
|
|
|
|
|
|
2013-06-05 01:58:43 +00:00
|
|
|
|
This is handy to add some elements to configuration variables,
|
2014-02-08 03:37:57 +00:00
|
|
|
|
but please do not abuse it in Elisp code, where you are usually
|
|
|
|
|
better off using `push' or `cl-pushnew'.
|
|
|
|
|
|
|
|
|
|
If you want to use `add-to-list' on a variable that is not
|
|
|
|
|
defined until a certain package is loaded, you should put the
|
|
|
|
|
call to `add-to-list' into a hook function that will be run only
|
|
|
|
|
after loading the package. `eval-after-load' provides one way to
|
|
|
|
|
do this. In some cases other hooks, such as major mode hooks,
|
|
|
|
|
can do the job."
|
2013-06-05 01:58:43 +00:00
|
|
|
|
(declare
|
|
|
|
|
(compiler-macro
|
|
|
|
|
(lambda (exp)
|
|
|
|
|
;; FIXME: Something like this could be used for `set' as well.
|
|
|
|
|
(if (or (not (eq 'quote (car-safe list-var)))
|
|
|
|
|
(special-variable-p (cadr list-var))
|
2013-07-22 17:24:31 +00:00
|
|
|
|
(not (macroexp-const-p append)))
|
2013-06-05 01:58:43 +00:00
|
|
|
|
exp
|
|
|
|
|
(let* ((sym (cadr list-var))
|
2013-07-22 17:24:31 +00:00
|
|
|
|
(append (eval append))
|
2013-06-05 01:58:43 +00:00
|
|
|
|
(msg (format "`add-to-list' can't use lexical var `%s'; use `push' or `cl-pushnew'"
|
|
|
|
|
sym))
|
|
|
|
|
;; Big ugly hack so we only output a warning during
|
|
|
|
|
;; byte-compilation, and so we can use
|
|
|
|
|
;; byte-compile-not-lexical-var-p to silence the warning
|
|
|
|
|
;; when a defvar has been seen but not yet executed.
|
|
|
|
|
(warnfun (lambda ()
|
|
|
|
|
;; FIXME: We should also emit a warning for let-bound
|
|
|
|
|
;; variables with dynamic binding.
|
|
|
|
|
(when (assq sym byte-compile--lexical-environment)
|
|
|
|
|
(byte-compile-log-warning msg t :error))))
|
|
|
|
|
(code
|
2013-07-22 17:24:31 +00:00
|
|
|
|
(macroexp-let2 macroexp-copyable-p x element
|
2013-10-25 01:10:27 +00:00
|
|
|
|
`(if ,(if compare-fn
|
|
|
|
|
(progn
|
|
|
|
|
(require 'cl-lib)
|
|
|
|
|
`(cl-member ,x ,sym :test ,compare-fn))
|
|
|
|
|
;; For bootstrapping reasons, don't rely on
|
|
|
|
|
;; cl--compiler-macro-member for the base case.
|
|
|
|
|
`(member ,x ,sym))
|
|
|
|
|
,sym
|
2013-07-22 17:24:31 +00:00
|
|
|
|
,(if append
|
|
|
|
|
`(setq ,sym (append ,sym (list ,x)))
|
|
|
|
|
`(push ,x ,sym))))))
|
2013-06-05 01:58:43 +00:00
|
|
|
|
(if (not (macroexp--compiling-p))
|
|
|
|
|
code
|
|
|
|
|
`(progn
|
|
|
|
|
(macroexp--funcall-if-compiled ',warnfun)
|
|
|
|
|
,code)))))))
|
2006-10-22 22:32:53 +00:00
|
|
|
|
(if (cond
|
2006-10-22 22:37:51 +00:00
|
|
|
|
((null compare-fn)
|
2006-09-10 17:45:42 +00:00
|
|
|
|
(member element (symbol-value list-var)))
|
2006-10-22 22:32:53 +00:00
|
|
|
|
((eq compare-fn 'eq)
|
|
|
|
|
(memq element (symbol-value list-var)))
|
|
|
|
|
((eq compare-fn 'eql)
|
|
|
|
|
(memql element (symbol-value list-var)))
|
2006-10-22 22:37:51 +00:00
|
|
|
|
(t
|
2006-10-30 22:49:04 +00:00
|
|
|
|
(let ((lst (symbol-value list-var)))
|
|
|
|
|
(while (and lst
|
|
|
|
|
(not (funcall compare-fn element (car lst))))
|
|
|
|
|
(setq lst (cdr lst)))
|
|
|
|
|
lst)))
|
1998-04-07 18:22:28 +00:00
|
|
|
|
(symbol-value list-var)
|
2000-10-10 02:47:30 +00:00
|
|
|
|
(set list-var
|
|
|
|
|
(if append
|
|
|
|
|
(append (symbol-value list-var) (list element))
|
|
|
|
|
(cons element (symbol-value list-var))))))
|
2001-10-09 11:14:31 +00:00
|
|
|
|
|
2005-06-13 21:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun add-to-ordered-list (list-var element &optional order)
|
2005-06-27 21:21:36 +00:00
|
|
|
|
"Add ELEMENT to the value of LIST-VAR if it isn't there yet.
|
2005-06-20 21:41:34 +00:00
|
|
|
|
The test for presence of ELEMENT is done with `eq'.
|
2005-06-13 21:29:52 +00:00
|
|
|
|
|
|
|
|
|
The resulting list is reordered so that the elements are in the
|
2005-06-20 21:41:34 +00:00
|
|
|
|
order given by each element's numeric list order. Elements
|
|
|
|
|
without a numeric list order are placed at the end of the list.
|
2005-06-13 21:29:52 +00:00
|
|
|
|
|
2005-06-27 21:21:36 +00:00
|
|
|
|
If the third optional argument ORDER is a number (integer or
|
|
|
|
|
float), set the element's list order to the given value. If
|
|
|
|
|
ORDER is nil or omitted, do not change the numeric order of
|
|
|
|
|
ELEMENT. If ORDER has any other value, remove the numeric order
|
|
|
|
|
of ELEMENT if it has one.
|
2005-06-14 08:14:06 +00:00
|
|
|
|
|
2005-06-15 20:58:20 +00:00
|
|
|
|
The list order for each element is stored in LIST-VAR's
|
2005-06-14 08:14:06 +00:00
|
|
|
|
`list-order' property.
|
2005-06-13 21:29:52 +00:00
|
|
|
|
|
|
|
|
|
The return value is the new value of LIST-VAR."
|
2005-06-15 20:58:20 +00:00
|
|
|
|
(let ((ordering (get list-var 'list-order)))
|
|
|
|
|
(unless ordering
|
|
|
|
|
(put list-var 'list-order
|
|
|
|
|
(setq ordering (make-hash-table :weakness 'key :test 'eq))))
|
2005-06-14 08:14:06 +00:00
|
|
|
|
(when order
|
2005-06-20 21:41:34 +00:00
|
|
|
|
(puthash element (and (numberp order) order) ordering))
|
|
|
|
|
(unless (memq element (symbol-value list-var))
|
|
|
|
|
(set list-var (cons element (symbol-value list-var))))
|
2005-06-14 08:14:06 +00:00
|
|
|
|
(set list-var (sort (symbol-value list-var)
|
|
|
|
|
(lambda (a b)
|
2005-06-15 20:58:20 +00:00
|
|
|
|
(let ((oa (gethash a ordering))
|
|
|
|
|
(ob (gethash b ordering)))
|
2005-06-20 21:41:34 +00:00
|
|
|
|
(if (and oa ob)
|
|
|
|
|
(< oa ob)
|
|
|
|
|
oa)))))))
|
2006-05-05 23:35:57 +00:00
|
|
|
|
|
2006-05-16 11:19:39 +00:00
|
|
|
|
(defun add-to-history (history-var newelt &optional maxelt keep-all)
|
2006-05-05 23:35:57 +00:00
|
|
|
|
"Add NEWELT to the history list stored in the variable HISTORY-VAR.
|
|
|
|
|
Return the new history list.
|
|
|
|
|
If MAXELT is non-nil, it specifies the maximum length of the history.
|
|
|
|
|
Otherwise, the maximum history length is the value of the `history-length'
|
|
|
|
|
property on symbol HISTORY-VAR, if set, or the value of the `history-length'
|
|
|
|
|
variable.
|
2006-05-16 11:19:39 +00:00
|
|
|
|
Remove duplicates of NEWELT if `history-delete-duplicates' is non-nil.
|
|
|
|
|
If optional fourth arg KEEP-ALL is non-nil, add NEWELT to history even
|
|
|
|
|
if it is empty or a duplicate."
|
2006-05-05 23:35:57 +00:00
|
|
|
|
(unless maxelt
|
|
|
|
|
(setq maxelt (or (get history-var 'history-length)
|
|
|
|
|
history-length)))
|
|
|
|
|
(let ((history (symbol-value history-var))
|
|
|
|
|
tail)
|
2006-05-16 11:19:39 +00:00
|
|
|
|
(when (and (listp history)
|
|
|
|
|
(or keep-all
|
|
|
|
|
(not (stringp newelt))
|
|
|
|
|
(> (length newelt) 0))
|
|
|
|
|
(or keep-all
|
|
|
|
|
(not (equal (car history) newelt))))
|
|
|
|
|
(if history-delete-duplicates
|
2012-09-08 14:30:09 +00:00
|
|
|
|
(setq history (delete newelt history)))
|
2006-05-16 11:19:39 +00:00
|
|
|
|
(setq history (cons newelt history))
|
|
|
|
|
(when (integerp maxelt)
|
|
|
|
|
(if (= 0 maxelt)
|
|
|
|
|
(setq history nil)
|
|
|
|
|
(setq tail (nthcdr (1- maxelt) history))
|
|
|
|
|
(when (consp tail)
|
|
|
|
|
(setcdr tail nil)))))
|
2006-05-05 23:35:57 +00:00
|
|
|
|
(set history-var history)))
|
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
;;;; Mode hooks.
|
|
|
|
|
|
|
|
|
|
(defvar delay-mode-hooks nil
|
|
|
|
|
"If non-nil, `run-mode-hooks' should delay running the hooks.")
|
|
|
|
|
(defvar delayed-mode-hooks nil
|
|
|
|
|
"List of delayed mode hooks waiting to be run.")
|
|
|
|
|
(make-variable-buffer-local 'delayed-mode-hooks)
|
|
|
|
|
(put 'delay-mode-hooks 'permanent-local t)
|
2005-06-13 21:29:52 +00:00
|
|
|
|
|
2011-10-27 03:01:40 +00:00
|
|
|
|
(defvar change-major-mode-after-body-hook nil
|
|
|
|
|
"Normal hook run in major mode functions, before the mode hooks.")
|
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defvar after-change-major-mode-hook nil
|
|
|
|
|
"Normal hook run at the very end of major mode functions.")
|
|
|
|
|
|
|
|
|
|
(defun run-mode-hooks (&rest hooks)
|
|
|
|
|
"Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS.
|
2012-02-02 02:57:26 +00:00
|
|
|
|
If the variable `delay-mode-hooks' is non-nil, does not run any hooks,
|
|
|
|
|
just adds the HOOKS to the list `delayed-mode-hooks'.
|
|
|
|
|
Otherwise, runs hooks in the sequence: `change-major-mode-after-body-hook',
|
|
|
|
|
`delayed-mode-hooks' (in reverse order), HOOKS, and finally
|
|
|
|
|
`after-change-major-mode-hook'. Major mode functions should use
|
|
|
|
|
this instead of `run-hooks' when running their FOO-mode-hook."
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(if delay-mode-hooks
|
|
|
|
|
;; Delaying case.
|
|
|
|
|
(dolist (hook hooks)
|
|
|
|
|
(push hook delayed-mode-hooks))
|
|
|
|
|
;; Normal case, just run the hook as before plus any delayed hooks.
|
|
|
|
|
(setq hooks (nconc (nreverse delayed-mode-hooks) hooks))
|
|
|
|
|
(setq delayed-mode-hooks nil)
|
2011-10-27 03:01:40 +00:00
|
|
|
|
(apply 'run-hooks (cons 'change-major-mode-after-body-hook hooks))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(run-hooks 'after-change-major-mode-hook)))
|
|
|
|
|
|
|
|
|
|
(defmacro delay-mode-hooks (&rest body)
|
|
|
|
|
"Execute BODY, but delay any `run-mode-hooks'.
|
|
|
|
|
These hooks will be executed by the first following call to
|
|
|
|
|
`run-mode-hooks' that occurs outside any `delayed-mode-hooks' form.
|
|
|
|
|
Only affects hooks run in the current buffer."
|
|
|
|
|
(declare (debug t) (indent 0))
|
|
|
|
|
`(progn
|
|
|
|
|
(make-local-variable 'delay-mode-hooks)
|
|
|
|
|
(let ((delay-mode-hooks t))
|
|
|
|
|
,@body)))
|
|
|
|
|
|
|
|
|
|
;; PUBLIC: find if the current mode derives from another.
|
|
|
|
|
|
|
|
|
|
(defun derived-mode-p (&rest modes)
|
|
|
|
|
"Non-nil if the current major mode is derived from one of MODES.
|
|
|
|
|
Uses the `derived-mode-parent' property of the symbol to trace backwards."
|
|
|
|
|
(let ((parent major-mode))
|
|
|
|
|
(while (and (not (memq parent modes))
|
|
|
|
|
(setq parent (get parent 'derived-mode-parent))))
|
|
|
|
|
parent))
|
|
|
|
|
|
|
|
|
|
;;;; Minor modes.
|
|
|
|
|
|
|
|
|
|
;; If a minor mode is not defined with define-minor-mode,
|
|
|
|
|
;; add it here explicitly.
|
|
|
|
|
;; isearch-mode is deliberately excluded, since you should
|
|
|
|
|
;; not call it yourself.
|
|
|
|
|
(defvar minor-mode-list '(auto-save-mode auto-fill-mode abbrev-mode
|
|
|
|
|
overwrite-mode view-mode
|
|
|
|
|
hs-minor-mode)
|
|
|
|
|
"List of all minor mode functions.")
|
|
|
|
|
|
|
|
|
|
(defun add-minor-mode (toggle name &optional keymap after toggle-fun)
|
|
|
|
|
"Register a new minor mode.
|
|
|
|
|
|
|
|
|
|
This is an XEmacs-compatibility function. Use `define-minor-mode' instead.
|
|
|
|
|
|
|
|
|
|
TOGGLE is a symbol which is the name of a buffer-local variable that
|
|
|
|
|
is toggled on or off to say whether the minor mode is active or not.
|
|
|
|
|
|
|
|
|
|
NAME specifies what will appear in the mode line when the minor mode
|
|
|
|
|
is active. NAME should be either a string starting with a space, or a
|
|
|
|
|
symbol whose value is such a string.
|
|
|
|
|
|
|
|
|
|
Optional KEYMAP is the keymap for the minor mode that will be added
|
|
|
|
|
to `minor-mode-map-alist'.
|
|
|
|
|
|
|
|
|
|
Optional AFTER specifies that TOGGLE should be added after AFTER
|
|
|
|
|
in `minor-mode-alist'.
|
|
|
|
|
|
|
|
|
|
Optional TOGGLE-FUN is an interactive function to toggle the mode.
|
|
|
|
|
It defaults to (and should by convention be) TOGGLE.
|
|
|
|
|
|
|
|
|
|
If TOGGLE has a non-nil `:included' property, an entry for the mode is
|
|
|
|
|
included in the mode-line minor mode menu.
|
|
|
|
|
If TOGGLE has a `:menu-tag', that is used for the menu item's label."
|
|
|
|
|
(unless (memq toggle minor-mode-list)
|
|
|
|
|
(push toggle minor-mode-list))
|
|
|
|
|
|
|
|
|
|
(unless toggle-fun (setq toggle-fun toggle))
|
|
|
|
|
(unless (eq toggle-fun toggle)
|
|
|
|
|
(put toggle :minor-mode-function toggle-fun))
|
|
|
|
|
;; Add the name to the minor-mode-alist.
|
|
|
|
|
(when name
|
|
|
|
|
(let ((existing (assq toggle minor-mode-alist)))
|
|
|
|
|
(if existing
|
|
|
|
|
(setcdr existing (list name))
|
|
|
|
|
(let ((tail minor-mode-alist) found)
|
|
|
|
|
(while (and tail (not found))
|
|
|
|
|
(if (eq after (caar tail))
|
|
|
|
|
(setq found tail)
|
|
|
|
|
(setq tail (cdr tail))))
|
|
|
|
|
(if found
|
|
|
|
|
(let ((rest (cdr found)))
|
|
|
|
|
(setcdr found nil)
|
|
|
|
|
(nconc found (list (list toggle name)) rest))
|
2010-05-05 04:27:16 +00:00
|
|
|
|
(push (list toggle name) minor-mode-alist))))))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;; Add the toggle to the minor-modes menu if requested.
|
|
|
|
|
(when (get toggle :included)
|
|
|
|
|
(define-key mode-line-mode-menu
|
|
|
|
|
(vector toggle)
|
|
|
|
|
(list 'menu-item
|
|
|
|
|
(concat
|
|
|
|
|
(or (get toggle :menu-tag)
|
|
|
|
|
(if (stringp name) name (symbol-name toggle)))
|
|
|
|
|
(let ((mode-name (if (symbolp name) (symbol-value name))))
|
|
|
|
|
(if (and (stringp mode-name) (string-match "[^ ]+" mode-name))
|
|
|
|
|
(concat " (" (match-string 0 mode-name) ")"))))
|
|
|
|
|
toggle-fun
|
|
|
|
|
:button (cons :toggle toggle))))
|
2005-06-13 21:29:52 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;; Add the map to the minor-mode-map-alist.
|
|
|
|
|
(when keymap
|
|
|
|
|
(let ((existing (assq toggle minor-mode-map-alist)))
|
|
|
|
|
(if existing
|
|
|
|
|
(setcdr existing keymap)
|
|
|
|
|
(let ((tail minor-mode-map-alist) found)
|
|
|
|
|
(while (and tail (not found))
|
|
|
|
|
(if (eq after (caar tail))
|
|
|
|
|
(setq found tail)
|
|
|
|
|
(setq tail (cdr tail))))
|
|
|
|
|
(if found
|
|
|
|
|
(let ((rest (cdr found)))
|
|
|
|
|
(setcdr found nil)
|
|
|
|
|
(nconc found (list (cons toggle keymap)) rest))
|
2010-05-05 04:27:16 +00:00
|
|
|
|
(push (cons toggle keymap) minor-mode-map-alist)))))))
|
2001-10-09 11:14:31 +00:00
|
|
|
|
|
2013-06-05 14:57:45 +00:00
|
|
|
|
;;;; Load history
|
2001-10-09 11:14:31 +00:00
|
|
|
|
|
2012-07-26 01:27:33 +00:00
|
|
|
|
(defsubst autoloadp (object)
|
|
|
|
|
"Non-nil if OBJECT is an autoload."
|
|
|
|
|
(eq 'autoload (car-safe object)))
|
|
|
|
|
|
|
|
|
|
;; (defun autoload-type (object)
|
|
|
|
|
;; "Returns the type of OBJECT or `function' or `command' if the type is nil.
|
|
|
|
|
;; OBJECT should be an autoload object."
|
|
|
|
|
;; (when (autoloadp object)
|
|
|
|
|
;; (let ((type (nth 3 object)))
|
|
|
|
|
;; (cond ((null type) (if (nth 2 object) 'command 'function))
|
|
|
|
|
;; ((eq 'keymap t) 'macro)
|
|
|
|
|
;; (type)))))
|
|
|
|
|
|
|
|
|
|
;; (defalias 'autoload-file #'cadr
|
|
|
|
|
;; "Return the name of the file from which AUTOLOAD will be loaded.
|
|
|
|
|
;; \n\(fn AUTOLOAD)")
|
|
|
|
|
|
2004-12-27 16:23:34 +00:00
|
|
|
|
(defun symbol-file (symbol &optional type)
|
2008-09-06 10:02:33 +00:00
|
|
|
|
"Return the name of the file that defined SYMBOL.
|
|
|
|
|
The value is normally an absolute file name. It can also be nil,
|
|
|
|
|
if the definition is not associated with any file. If SYMBOL
|
|
|
|
|
specifies an autoloaded function, the value can be a relative
|
|
|
|
|
file name without extension.
|
|
|
|
|
|
|
|
|
|
If TYPE is nil, then any kind of definition is acceptable. If
|
|
|
|
|
TYPE is `defun', `defvar', or `defface', that specifies function
|
|
|
|
|
definition, variable definition, or face definition only."
|
2004-12-27 16:23:34 +00:00
|
|
|
|
(if (and (or (null type) (eq type 'defun))
|
2014-01-06 23:34:05 +00:00
|
|
|
|
(symbolp symbol)
|
2012-07-26 01:27:33 +00:00
|
|
|
|
(autoloadp (symbol-function symbol)))
|
2004-12-27 16:23:34 +00:00
|
|
|
|
(nth 1 (symbol-function symbol))
|
2002-09-09 23:13:18 +00:00
|
|
|
|
(let ((files load-history)
|
2002-11-20 12:58:37 +00:00
|
|
|
|
file)
|
2002-09-09 23:13:18 +00:00
|
|
|
|
(while files
|
2004-12-27 16:23:34 +00:00
|
|
|
|
(if (if type
|
|
|
|
|
(if (eq type 'defvar)
|
|
|
|
|
;; Variables are present just as their names.
|
|
|
|
|
(member symbol (cdr (car files)))
|
|
|
|
|
;; Other types are represented as (TYPE . NAME).
|
|
|
|
|
(member (cons type symbol) (cdr (car files))))
|
|
|
|
|
;; We accept all types, so look for variable def
|
|
|
|
|
;; and then for any other kind.
|
|
|
|
|
(or (member symbol (cdr (car files)))
|
|
|
|
|
(rassq symbol (cdr (car files)))))
|
2002-09-09 23:13:18 +00:00
|
|
|
|
(setq file (car (car files)) files nil))
|
|
|
|
|
(setq files (cdr files)))
|
|
|
|
|
file)))
|
2001-10-09 11:14:31 +00:00
|
|
|
|
|
2005-10-28 16:55:48 +00:00
|
|
|
|
(defun locate-library (library &optional nosuffix path interactive-call)
|
|
|
|
|
"Show the precise file name of Emacs library LIBRARY.
|
2009-02-13 15:19:06 +00:00
|
|
|
|
LIBRARY should be a relative file name of the library, a string.
|
|
|
|
|
It can omit the suffix (a.k.a. file-name extension) if NOSUFFIX is
|
|
|
|
|
nil (which is the default, see below).
|
2005-10-28 16:55:48 +00:00
|
|
|
|
This command searches the directories in `load-path' like `\\[load-library]'
|
|
|
|
|
to find the file that `\\[load-library] RET LIBRARY RET' would load.
|
|
|
|
|
Optional second arg NOSUFFIX non-nil means don't add suffixes `load-suffixes'
|
|
|
|
|
to the specified name LIBRARY.
|
|
|
|
|
|
|
|
|
|
If the optional third arg PATH is specified, that list of directories
|
|
|
|
|
is used instead of `load-path'.
|
|
|
|
|
|
2008-06-10 03:10:06 +00:00
|
|
|
|
When called from a program, the file name is normally returned as a
|
2005-10-28 16:55:48 +00:00
|
|
|
|
string. When run interactively, the argument INTERACTIVE-CALL is t,
|
|
|
|
|
and the file name is displayed in the echo area."
|
|
|
|
|
(interactive (list (completing-read "Locate library: "
|
2008-04-19 04:01:16 +00:00
|
|
|
|
(apply-partially
|
|
|
|
|
'locate-file-completion-table
|
|
|
|
|
load-path (get-load-suffixes)))
|
2005-10-28 16:55:48 +00:00
|
|
|
|
nil nil
|
|
|
|
|
t))
|
|
|
|
|
(let ((file (locate-file library
|
|
|
|
|
(or path load-path)
|
2006-02-27 02:01:08 +00:00
|
|
|
|
(append (unless nosuffix (get-load-suffixes))
|
|
|
|
|
load-file-rep-suffixes))))
|
2005-10-28 16:55:48 +00:00
|
|
|
|
(if interactive-call
|
|
|
|
|
(if file
|
|
|
|
|
(message "Library is file %s" (abbreviate-file-name file))
|
|
|
|
|
(message "No library %s in search path" library)))
|
|
|
|
|
file))
|
|
|
|
|
|
2002-05-30 17:12:53 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Process stuff.
|
|
|
|
|
|
2007-11-17 03:42:22 +00:00
|
|
|
|
(defun process-lines (program &rest args)
|
|
|
|
|
"Execute PROGRAM with ARGS, returning its output as a list of lines.
|
|
|
|
|
Signal an error if the program returns with a non-zero exit status."
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let ((status (apply 'call-process program nil (current-buffer) nil args)))
|
|
|
|
|
(unless (eq status 0)
|
|
|
|
|
(error "%s exited with status %s" program status))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(let (lines)
|
|
|
|
|
(while (not (eobp))
|
|
|
|
|
(setq lines (cons (buffer-substring-no-properties
|
|
|
|
|
(line-beginning-position)
|
|
|
|
|
(line-end-position))
|
|
|
|
|
lines))
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
(nreverse lines)))))
|
|
|
|
|
|
2011-06-15 17:30:41 +00:00
|
|
|
|
(defun process-live-p (process)
|
2011-05-31 18:40:00 +00:00
|
|
|
|
"Returns non-nil if PROCESS is alive.
|
|
|
|
|
A process is considered alive if its status is `run', `open',
|
2013-12-02 07:13:01 +00:00
|
|
|
|
`listen', `connect' or `stop'. Value is nil if PROCESS is not a
|
|
|
|
|
process."
|
|
|
|
|
(and (processp process)
|
|
|
|
|
(memq (process-status process)
|
|
|
|
|
'(run open listen connect stop))))
|
2011-05-31 18:40:00 +00:00
|
|
|
|
|
2002-05-30 17:12:53 +00:00
|
|
|
|
;; compatibility
|
|
|
|
|
|
2007-04-09 23:10:00 +00:00
|
|
|
|
(make-obsolete
|
|
|
|
|
'process-kill-without-query
|
|
|
|
|
"use `process-query-on-exit-flag' or `set-process-query-on-exit-flag'."
|
|
|
|
|
"22.1")
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(defun process-kill-without-query (process &optional _flag)
|
2002-05-30 17:12:53 +00:00
|
|
|
|
"Say no query needed if PROCESS is running when Emacs is exited.
|
|
|
|
|
Optional second argument if non-nil says to require a query.
|
2004-05-07 01:06:20 +00:00
|
|
|
|
Value is t if a query was formerly required."
|
2002-05-30 17:12:53 +00:00
|
|
|
|
(let ((old (process-query-on-exit-flag process)))
|
|
|
|
|
(set-process-query-on-exit-flag process nil)
|
|
|
|
|
old))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2009-07-18 21:06:04 +00:00
|
|
|
|
(defun process-kill-buffer-query-function ()
|
|
|
|
|
"Ask before killing a buffer that has a running process."
|
|
|
|
|
(let ((process (get-buffer-process (current-buffer))))
|
|
|
|
|
(or (not process)
|
|
|
|
|
(not (memq (process-status process) '(run stop open listen)))
|
|
|
|
|
(not (process-query-on-exit-flag process))
|
2011-09-11 03:35:02 +00:00
|
|
|
|
(yes-or-no-p
|
|
|
|
|
(format "Buffer %S has a running process; kill it? "
|
|
|
|
|
(buffer-name (current-buffer)))))))
|
2009-07-18 21:06:04 +00:00
|
|
|
|
|
|
|
|
|
(add-hook 'kill-buffer-query-functions 'process-kill-buffer-query-function)
|
|
|
|
|
|
2003-01-14 09:56:10 +00:00
|
|
|
|
;; process plist management
|
|
|
|
|
|
|
|
|
|
(defun process-get (process propname)
|
|
|
|
|
"Return the value of PROCESS' PROPNAME property.
|
|
|
|
|
This is the last value stored with `(process-put PROCESS PROPNAME VALUE)'."
|
|
|
|
|
(plist-get (process-plist process) propname))
|
|
|
|
|
|
|
|
|
|
(defun process-put (process propname value)
|
|
|
|
|
"Change PROCESS' PROPNAME property to VALUE.
|
|
|
|
|
It can be retrieved with `(process-get PROCESS PROPNAME)'."
|
2003-02-04 12:29:42 +00:00
|
|
|
|
(set-process-plist process
|
2003-01-14 09:56:10 +00:00
|
|
|
|
(plist-put (process-plist process) propname value)))
|
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
|
|
|
|
;;;; Input and display facilities.
|
|
|
|
|
|
2009-08-19 03:03:05 +00:00
|
|
|
|
(defconst read-key-empty-map (make-sparse-keymap))
|
|
|
|
|
|
2009-10-20 01:29:17 +00:00
|
|
|
|
(defvar read-key-delay 0.01) ;Fast enough for 100Hz repeat rate, hopefully.
|
2009-08-19 03:03:05 +00:00
|
|
|
|
|
|
|
|
|
(defun read-key (&optional prompt)
|
|
|
|
|
"Read a key from the keyboard.
|
|
|
|
|
Contrary to `read-event' this will not return a raw event but instead will
|
|
|
|
|
obey the input decoding and translations usually done by `read-key-sequence'.
|
|
|
|
|
So escape sequences and keyboard encoding are taken into account.
|
|
|
|
|
When there's an ambiguity because the key looks like the prefix of
|
|
|
|
|
some sort of escape sequence, the ambiguity is resolved via `read-key-delay'."
|
2012-04-11 18:13:20 +00:00
|
|
|
|
;; This overriding-terminal-local-map binding also happens to
|
|
|
|
|
;; disable quail's input methods, so although read-key-sequence
|
|
|
|
|
;; always inherits the input method, in practice read-key does not
|
|
|
|
|
;; inherit the input method (at least not if it's based on quail).
|
2013-06-05 01:58:43 +00:00
|
|
|
|
(let ((overriding-terminal-local-map nil)
|
|
|
|
|
(overriding-local-map read-key-empty-map)
|
2010-08-21 08:56:54 +00:00
|
|
|
|
(echo-keystrokes 0)
|
2009-08-19 03:03:05 +00:00
|
|
|
|
(old-global-map (current-global-map))
|
|
|
|
|
(timer (run-with-idle-timer
|
|
|
|
|
;; Wait long enough that Emacs has the time to receive and
|
|
|
|
|
;; process all the raw events associated with the single-key.
|
|
|
|
|
;; But don't wait too long, or the user may find the delay
|
|
|
|
|
;; annoying (or keep hitting more keys which may then get
|
|
|
|
|
;; lost or misinterpreted).
|
|
|
|
|
;; This is only relevant for keys which Emacs perceives as
|
|
|
|
|
;; "prefixes", such as C-x (because of the C-x 8 map in
|
|
|
|
|
;; key-translate-table and the C-x @ map in function-key-map)
|
|
|
|
|
;; or ESC (because of terminal escape sequences in
|
|
|
|
|
;; input-decode-map).
|
|
|
|
|
read-key-delay t
|
|
|
|
|
(lambda ()
|
|
|
|
|
(let ((keys (this-command-keys-vector)))
|
|
|
|
|
(unless (zerop (length keys))
|
|
|
|
|
;; `keys' is non-empty, so the user has hit at least
|
|
|
|
|
;; one key; there's no point waiting any longer, even
|
|
|
|
|
;; though read-key-sequence thinks we should wait
|
|
|
|
|
;; for more input to decide how to interpret the
|
|
|
|
|
;; current input.
|
|
|
|
|
(throw 'read-key keys)))))))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
2010-08-19 14:37:31 +00:00
|
|
|
|
(use-global-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
;; Don't hide the menu-bar and tool-bar entries.
|
|
|
|
|
(define-key map [menu-bar] (lookup-key global-map [menu-bar]))
|
2012-04-27 02:24:38 +00:00
|
|
|
|
(define-key map [tool-bar]
|
|
|
|
|
;; This hack avoids evaluating the :filter (Bug#9922).
|
|
|
|
|
(or (cdr (assq 'tool-bar global-map))
|
|
|
|
|
(lookup-key global-map [tool-bar])))
|
2010-08-19 14:37:31 +00:00
|
|
|
|
map))
|
2009-10-20 01:29:17 +00:00
|
|
|
|
(aref (catch 'read-key (read-key-sequence-vector prompt nil t)) 0))
|
2009-08-19 03:03:05 +00:00
|
|
|
|
(cancel-timer timer)
|
|
|
|
|
(use-global-map old-global-map))))
|
|
|
|
|
|
2012-10-07 19:48:02 +00:00
|
|
|
|
(defvar read-passwd-map
|
|
|
|
|
;; BEWARE: `defconst' would purecopy it, breaking the sharing with
|
|
|
|
|
;; minibuffer-local-map along the way!
|
2012-10-06 17:29:15 +00:00
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(set-keymap-parent map minibuffer-local-map)
|
|
|
|
|
(define-key map "\C-u" #'delete-minibuffer-contents) ;bug#12570
|
|
|
|
|
map)
|
|
|
|
|
"Keymap used while reading passwords.")
|
|
|
|
|
|
2004-10-29 21:21:33 +00:00
|
|
|
|
(defun read-passwd (prompt &optional confirm default)
|
|
|
|
|
"Read a password, prompting with PROMPT, and return it.
|
|
|
|
|
If optional CONFIRM is non-nil, read the password twice to make sure.
|
|
|
|
|
Optional DEFAULT is a default password to use instead of empty input.
|
|
|
|
|
|
|
|
|
|
This function echoes `.' for each character that the user types.
|
2008-11-16 20:02:49 +00:00
|
|
|
|
|
2004-10-29 21:21:33 +00:00
|
|
|
|
Once the caller uses the password, it can erase the password
|
|
|
|
|
by doing (clear-string STRING)."
|
2012-04-11 18:13:20 +00:00
|
|
|
|
(if confirm
|
|
|
|
|
(let (success)
|
|
|
|
|
(while (not success)
|
|
|
|
|
(let ((first (read-passwd prompt nil default))
|
|
|
|
|
(second (read-passwd "Confirm password: " nil default)))
|
|
|
|
|
(if (equal first second)
|
|
|
|
|
(progn
|
|
|
|
|
(and (arrayp second) (clear-string second))
|
|
|
|
|
(setq success first))
|
|
|
|
|
(and (arrayp first) (clear-string first))
|
|
|
|
|
(and (arrayp second) (clear-string second))
|
|
|
|
|
(message "Password not repeated accurately; please start over")
|
|
|
|
|
(sit-for 1))))
|
|
|
|
|
success)
|
2012-05-02 21:34:57 +00:00
|
|
|
|
(let ((hide-chars-fun
|
|
|
|
|
(lambda (beg end _len)
|
|
|
|
|
(clear-this-command-keys)
|
|
|
|
|
(setq beg (min end (max (minibuffer-prompt-end)
|
|
|
|
|
beg)))
|
|
|
|
|
(dotimes (i (- end beg))
|
|
|
|
|
(put-text-property (+ i beg) (+ 1 i beg)
|
|
|
|
|
'display (string ?.)))))
|
|
|
|
|
minibuf)
|
2012-04-11 18:13:20 +00:00
|
|
|
|
(minibuffer-with-setup-hook
|
|
|
|
|
(lambda ()
|
|
|
|
|
(setq minibuf (current-buffer))
|
|
|
|
|
;; Turn off electricity.
|
2012-10-07 19:48:02 +00:00
|
|
|
|
(setq-local post-self-insert-hook nil)
|
|
|
|
|
(setq-local buffer-undo-list t)
|
|
|
|
|
(setq-local select-active-regions nil)
|
2012-10-06 17:29:15 +00:00
|
|
|
|
(use-local-map read-passwd-map)
|
2013-10-04 19:06:45 +00:00
|
|
|
|
(setq-local inhibit-modification-hooks nil) ;bug#15501.
|
2013-12-09 02:38:42 +00:00
|
|
|
|
(setq-local show-paren-mode nil) ;bug#16091.
|
2012-05-02 21:34:57 +00:00
|
|
|
|
(add-hook 'after-change-functions hide-chars-fun nil 'local))
|
2012-04-11 18:13:20 +00:00
|
|
|
|
(unwind-protect
|
2012-10-06 17:29:15 +00:00
|
|
|
|
(let ((enable-recursive-minibuffers t))
|
|
|
|
|
(read-string prompt nil t default)) ; t = "no history"
|
2012-04-11 18:13:20 +00:00
|
|
|
|
(when (buffer-live-p minibuf)
|
2012-05-02 21:34:57 +00:00
|
|
|
|
(with-current-buffer minibuf
|
|
|
|
|
;; Not sure why but it seems that there might be cases where the
|
|
|
|
|
;; minibuffer is not always properly reset later on, so undo
|
|
|
|
|
;; whatever we've done here (bug#11392).
|
|
|
|
|
(remove-hook 'after-change-functions hide-chars-fun 'local)
|
|
|
|
|
(kill-local-variable 'post-self-insert-hook)
|
|
|
|
|
;; And of course, don't keep the sensitive data around.
|
|
|
|
|
(erase-buffer))))))))
|
2004-10-29 21:21:33 +00:00
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(defun read-number (prompt &optional default)
|
2007-04-21 08:55:41 +00:00
|
|
|
|
"Read a numeric value in the minibuffer, prompting with PROMPT.
|
|
|
|
|
DEFAULT specifies a default value to return if the user just types RET.
|
2013-04-27 21:12:17 +00:00
|
|
|
|
The value of DEFAULT is inserted into PROMPT.
|
|
|
|
|
This function is used by the `interactive' code letter `n'."
|
2012-07-29 18:11:42 +00:00
|
|
|
|
(let ((n nil)
|
|
|
|
|
(default1 (if (consp default) (car default) default)))
|
|
|
|
|
(when default1
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(setq prompt
|
2004-06-02 22:44:45 +00:00
|
|
|
|
(if (string-match "\\(\\):[ \t]*\\'" prompt)
|
2012-07-29 18:11:42 +00:00
|
|
|
|
(replace-match (format " (default %s)" default1) t t prompt 1)
|
2004-06-02 22:44:45 +00:00
|
|
|
|
(replace-regexp-in-string "[ \t]*\\'"
|
2012-07-29 18:11:42 +00:00
|
|
|
|
(format " (default %s) " default1)
|
2004-06-07 20:54:42 +00:00
|
|
|
|
prompt t t))))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(while
|
|
|
|
|
(progn
|
2012-07-29 18:11:42 +00:00
|
|
|
|
(let ((str (read-from-minibuffer
|
|
|
|
|
prompt nil nil nil nil
|
|
|
|
|
(when default
|
|
|
|
|
(if (consp default)
|
|
|
|
|
(mapcar 'number-to-string (delq nil default))
|
|
|
|
|
(number-to-string default))))))
|
2007-04-22 16:56:19 +00:00
|
|
|
|
(condition-case nil
|
|
|
|
|
(setq n (cond
|
2012-07-29 18:11:42 +00:00
|
|
|
|
((zerop (length str)) default1)
|
2013-04-24 17:31:43 +00:00
|
|
|
|
((stringp str) (read str))))
|
2007-04-22 16:56:19 +00:00
|
|
|
|
(error nil)))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(unless (numberp n)
|
|
|
|
|
(message "Please enter a number.")
|
|
|
|
|
(sit-for 1)
|
|
|
|
|
t)))
|
|
|
|
|
n))
|
2006-07-10 18:52:13 +00:00
|
|
|
|
|
2011-01-08 19:17:23 +00:00
|
|
|
|
(defun read-char-choice (prompt chars &optional inhibit-keyboard-quit)
|
|
|
|
|
"Read and return one of CHARS, prompting for PROMPT.
|
|
|
|
|
Any input that is not one of CHARS is ignored.
|
|
|
|
|
|
|
|
|
|
If optional argument INHIBIT-KEYBOARD-QUIT is non-nil, ignore
|
|
|
|
|
keyboard-quit events while waiting for a valid input."
|
|
|
|
|
(unless (consp chars)
|
|
|
|
|
(error "Called `read-char-choice' without valid char choices"))
|
2011-07-15 23:59:25 +00:00
|
|
|
|
(let (char done show-help (helpbuf " *Char Help*"))
|
2011-03-15 02:42:31 +00:00
|
|
|
|
(let ((cursor-in-echo-area t)
|
2012-09-07 10:19:58 +00:00
|
|
|
|
(executing-kbd-macro executing-kbd-macro)
|
|
|
|
|
(esc-flag nil))
|
2011-07-15 23:59:25 +00:00
|
|
|
|
(save-window-excursion ; in case we call help-form-show
|
|
|
|
|
(while (not done)
|
|
|
|
|
(unless (get-text-property 0 'face prompt)
|
|
|
|
|
(setq prompt (propertize prompt 'face 'minibuffer-prompt)))
|
|
|
|
|
(setq char (let ((inhibit-quit inhibit-keyboard-quit))
|
|
|
|
|
(read-key prompt)))
|
2011-10-05 03:37:21 +00:00
|
|
|
|
(and show-help (buffer-live-p (get-buffer helpbuf))
|
2011-07-15 23:59:25 +00:00
|
|
|
|
(kill-buffer helpbuf))
|
|
|
|
|
(cond
|
|
|
|
|
((not (numberp char)))
|
|
|
|
|
;; If caller has set help-form, that's enough.
|
|
|
|
|
;; They don't explicitly have to add help-char to chars.
|
|
|
|
|
((and help-form
|
|
|
|
|
(eq char help-char)
|
|
|
|
|
(setq show-help t)
|
|
|
|
|
(help-form-show)))
|
|
|
|
|
((memq char chars)
|
|
|
|
|
(setq done t))
|
|
|
|
|
((and executing-kbd-macro (= char -1))
|
|
|
|
|
;; read-event returns -1 if we are in a kbd macro and
|
|
|
|
|
;; there are no more events in the macro. Attempt to
|
|
|
|
|
;; get an event interactively.
|
|
|
|
|
(setq executing-kbd-macro nil))
|
2012-09-07 10:19:58 +00:00
|
|
|
|
((not inhibit-keyboard-quit)
|
|
|
|
|
(cond
|
|
|
|
|
((and (null esc-flag) (eq char ?\e))
|
|
|
|
|
(setq esc-flag t))
|
|
|
|
|
((memq char '(?\C-g ?\e))
|
|
|
|
|
(keyboard-quit))))))))
|
2011-03-15 02:42:31 +00:00
|
|
|
|
;; Display the question with the answer. But without cursor-in-echo-area.
|
2011-01-08 19:17:23 +00:00
|
|
|
|
(message "%s%s" prompt (char-to-string char))
|
|
|
|
|
char))
|
|
|
|
|
|
2006-07-10 18:52:13 +00:00
|
|
|
|
(defun sit-for (seconds &optional nodisp obsolete)
|
|
|
|
|
"Perform redisplay, then wait for SECONDS seconds or until input is available.
|
|
|
|
|
SECONDS may be a floating-point value.
|
|
|
|
|
\(On operating systems that do not support waiting for fractions of a
|
|
|
|
|
second, floating-point values are rounded down to the nearest integer.)
|
|
|
|
|
|
|
|
|
|
If optional arg NODISP is t, don't redisplay, just wait for input.
|
|
|
|
|
Redisplay does not happen if input is available before it starts.
|
|
|
|
|
|
|
|
|
|
Value is t if waited the full time with no input arriving, and nil otherwise.
|
|
|
|
|
|
2006-07-11 00:17:43 +00:00
|
|
|
|
An obsolete, but still supported form is
|
2006-07-10 18:52:13 +00:00
|
|
|
|
\(sit-for SECONDS &optional MILLISECONDS NODISP)
|
2006-07-11 00:17:43 +00:00
|
|
|
|
where the optional arg MILLISECONDS specifies an additional wait period,
|
2006-07-10 18:52:13 +00:00
|
|
|
|
in milliseconds; this was useful when Emacs was built without
|
2009-10-16 03:21:18 +00:00
|
|
|
|
floating point support."
|
2013-07-06 00:10:54 +00:00
|
|
|
|
(declare (advertised-calling-convention (seconds &optional nodisp) "22.1"))
|
2008-02-21 08:13:45 +00:00
|
|
|
|
(if (numberp nodisp)
|
|
|
|
|
(setq seconds (+ seconds (* 1e-3 nodisp))
|
|
|
|
|
nodisp obsolete)
|
|
|
|
|
(if obsolete (setq nodisp obsolete)))
|
2006-09-11 22:21:55 +00:00
|
|
|
|
(cond
|
|
|
|
|
(noninteractive
|
|
|
|
|
(sleep-for seconds)
|
|
|
|
|
t)
|
2013-10-18 04:27:34 +00:00
|
|
|
|
((input-pending-p t)
|
2006-09-11 22:21:55 +00:00
|
|
|
|
nil)
|
|
|
|
|
((<= seconds 0)
|
|
|
|
|
(or nodisp (redisplay)))
|
|
|
|
|
(t
|
|
|
|
|
(or nodisp (redisplay))
|
2013-07-06 00:10:54 +00:00
|
|
|
|
;; FIXME: we should not read-event here at all, because it's much too
|
|
|
|
|
;; difficult to reliably "undo" a read-event by pushing it onto
|
|
|
|
|
;; unread-command-events.
|
|
|
|
|
(let ((read (read-event nil t seconds)))
|
2006-09-11 22:21:55 +00:00
|
|
|
|
(or (null read)
|
2006-10-22 22:32:53 +00:00
|
|
|
|
(progn
|
|
|
|
|
;; If last command was a prefix arg, e.g. C-u, push this event onto
|
|
|
|
|
;; unread-command-events as (t . EVENT) so it will be added to
|
|
|
|
|
;; this-command-keys by read-key-sequence.
|
|
|
|
|
(if (eq overriding-terminal-local-map universal-argument-map)
|
|
|
|
|
(setq read (cons t read)))
|
|
|
|
|
(push read unread-command-events)
|
|
|
|
|
nil))))))
|
2011-01-07 17:34:02 +00:00
|
|
|
|
|
2013-09-18 03:50:18 +00:00
|
|
|
|
;; Behind display-popup-menus-p test.
|
2014-01-22 01:50:40 +00:00
|
|
|
|
(declare-function x-popup-dialog "menu.c" (position contents &optional header))
|
2013-09-18 03:50:18 +00:00
|
|
|
|
|
2011-01-20 02:55:36 +00:00
|
|
|
|
(defun y-or-n-p (prompt)
|
2011-01-07 17:34:02 +00:00
|
|
|
|
"Ask user a \"y or n\" question. Return t if answer is \"y\".
|
2011-01-20 02:55:36 +00:00
|
|
|
|
PROMPT is the string to display to ask the question. It should
|
|
|
|
|
end in a space; `y-or-n-p' adds \"(y or n) \" to it.
|
2011-01-08 21:17:58 +00:00
|
|
|
|
|
2012-09-09 06:43:47 +00:00
|
|
|
|
No confirmation of the answer is requested; a single character is
|
|
|
|
|
enough. SPC also means yes, and DEL means no.
|
|
|
|
|
|
|
|
|
|
To be precise, this function translates user input into responses
|
|
|
|
|
by consulting the bindings in `query-replace-map'; see the
|
|
|
|
|
documentation of that variable for more information. In this
|
|
|
|
|
case, the useful bindings are `act', `skip', `recenter',
|
|
|
|
|
`scroll-up', `scroll-down', and `quit'.
|
|
|
|
|
An `act' response means yes, and a `skip' response means no.
|
|
|
|
|
A `quit' response means to invoke `keyboard-quit'.
|
|
|
|
|
If the user enters `recenter', `scroll-up', or `scroll-down'
|
|
|
|
|
responses, perform the requested window recentering or scrolling
|
|
|
|
|
and ask again.
|
2011-01-07 17:34:02 +00:00
|
|
|
|
|
|
|
|
|
Under a windowing system a dialog box will be used if `last-nonmenu-event'
|
|
|
|
|
is nil and `use-dialog-box' is non-nil."
|
|
|
|
|
;; ¡Beware! when I tried to edebug this code, Emacs got into a weird state
|
|
|
|
|
;; where all the keys were unbound (i.e. it somehow got triggered
|
|
|
|
|
;; within read-key, apparently). I had to kill it.
|
2014-02-27 14:21:28 +00:00
|
|
|
|
(let ((answer 'recenter)
|
|
|
|
|
(padded (lambda (prompt &optional dialog)
|
|
|
|
|
(let ((l (length prompt)))
|
|
|
|
|
(concat prompt
|
|
|
|
|
(if (or (zerop l) (eq ?\s (aref prompt (1- l))))
|
|
|
|
|
"" " ")
|
|
|
|
|
(if dialog "" "(y or n) "))))))
|
2011-10-29 08:41:39 +00:00
|
|
|
|
(cond
|
|
|
|
|
(noninteractive
|
2014-02-27 14:21:28 +00:00
|
|
|
|
(setq prompt (funcall padded prompt))
|
2011-10-29 08:41:39 +00:00
|
|
|
|
(let ((temp-prompt prompt))
|
|
|
|
|
(while (not (memq answer '(act skip)))
|
|
|
|
|
(let ((str (read-string temp-prompt)))
|
|
|
|
|
(cond ((member str '("y" "Y")) (setq answer 'act))
|
|
|
|
|
((member str '("n" "N")) (setq answer 'skip))
|
|
|
|
|
(t (setq temp-prompt (concat "Please answer y or n. "
|
|
|
|
|
prompt))))))))
|
|
|
|
|
((and (display-popup-menus-p)
|
|
|
|
|
(listp last-nonmenu-event)
|
|
|
|
|
use-dialog-box)
|
2014-02-27 14:21:28 +00:00
|
|
|
|
(setq prompt (funcall padded prompt t)
|
|
|
|
|
answer (x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip)))))
|
2011-10-29 08:41:39 +00:00
|
|
|
|
(t
|
2014-02-27 14:21:28 +00:00
|
|
|
|
(setq prompt (funcall padded prompt))
|
2011-01-07 17:34:02 +00:00
|
|
|
|
(while
|
2012-09-09 06:43:47 +00:00
|
|
|
|
(let* ((scroll-actions '(recenter scroll-up scroll-down
|
|
|
|
|
scroll-other-window scroll-other-window-down))
|
|
|
|
|
(key
|
2011-01-07 17:34:02 +00:00
|
|
|
|
(let ((cursor-in-echo-area t))
|
|
|
|
|
(when minibuffer-auto-raise
|
|
|
|
|
(raise-frame (window-frame (minibuffer-window))))
|
2012-09-09 06:43:47 +00:00
|
|
|
|
(read-key (propertize (if (memq answer scroll-actions)
|
2011-01-07 17:34:02 +00:00
|
|
|
|
prompt
|
|
|
|
|
(concat "Please answer y or n. "
|
|
|
|
|
prompt))
|
|
|
|
|
'face 'minibuffer-prompt)))))
|
|
|
|
|
(setq answer (lookup-key query-replace-map (vector key) t))
|
|
|
|
|
(cond
|
2012-09-09 06:43:47 +00:00
|
|
|
|
((memq answer '(skip act)) nil)
|
|
|
|
|
((eq answer 'recenter)
|
|
|
|
|
(recenter) t)
|
|
|
|
|
((eq answer 'scroll-up)
|
|
|
|
|
(ignore-errors (scroll-up-command)) t)
|
|
|
|
|
((eq answer 'scroll-down)
|
|
|
|
|
(ignore-errors (scroll-down-command)) t)
|
|
|
|
|
((eq answer 'scroll-other-window)
|
|
|
|
|
(ignore-errors (scroll-other-window)) t)
|
|
|
|
|
((eq answer 'scroll-other-window-down)
|
|
|
|
|
(ignore-errors (scroll-other-window-down)) t)
|
|
|
|
|
((or (memq answer '(exit-prefix quit)) (eq key ?\e))
|
|
|
|
|
(signal 'quit nil) t)
|
|
|
|
|
(t t)))
|
2011-01-07 17:34:02 +00:00
|
|
|
|
(ding)
|
2011-10-29 08:41:39 +00:00
|
|
|
|
(discard-input))))
|
2011-01-07 17:34:02 +00:00
|
|
|
|
(let ((ret (eq answer 'act)))
|
|
|
|
|
(unless noninteractive
|
2014-02-27 14:21:28 +00:00
|
|
|
|
(message "%s%c" prompt (if ret ?y ?n)))
|
2011-01-07 17:34:02 +00:00
|
|
|
|
ret)))
|
|
|
|
|
|
1997-12-21 00:50:07 +00:00
|
|
|
|
|
2002-04-19 00:06:54 +00:00
|
|
|
|
;;; Atomic change groups.
|
|
|
|
|
|
2002-02-06 15:20:36 +00:00
|
|
|
|
(defmacro atomic-change-group (&rest body)
|
|
|
|
|
"Perform BODY as an atomic change group.
|
|
|
|
|
This means that if BODY exits abnormally,
|
|
|
|
|
all of its changes to the current buffer are undone.
|
2002-08-02 17:59:22 +00:00
|
|
|
|
This works regardless of whether undo is enabled in the buffer.
|
2002-02-06 15:20:36 +00:00
|
|
|
|
|
|
|
|
|
This mechanism is transparent to ordinary use of undo;
|
|
|
|
|
if undo is enabled in the buffer and BODY succeeds, the
|
|
|
|
|
user can undo the change normally."
|
2005-12-03 02:31:40 +00:00
|
|
|
|
(declare (indent 0) (debug t))
|
2002-02-06 15:20:36 +00:00
|
|
|
|
(let ((handle (make-symbol "--change-group-handle--"))
|
|
|
|
|
(success (make-symbol "--change-group-success--")))
|
|
|
|
|
`(let ((,handle (prepare-change-group))
|
2008-01-11 14:44:15 +00:00
|
|
|
|
;; Don't truncate any undo data in the middle of this.
|
|
|
|
|
(undo-outer-limit nil)
|
|
|
|
|
(undo-limit most-positive-fixnum)
|
|
|
|
|
(undo-strong-limit most-positive-fixnum)
|
2002-02-06 15:20:36 +00:00
|
|
|
|
(,success nil))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
;; This is inside the unwind-protect because
|
|
|
|
|
;; it enables undo if that was disabled; we need
|
|
|
|
|
;; to make sure that it gets disabled again.
|
|
|
|
|
(activate-change-group ,handle)
|
|
|
|
|
,@body
|
|
|
|
|
(setq ,success t))
|
|
|
|
|
;; Either of these functions will disable undo
|
|
|
|
|
;; if it was disabled before.
|
|
|
|
|
(if ,success
|
|
|
|
|
(accept-change-group ,handle)
|
|
|
|
|
(cancel-change-group ,handle))))))
|
|
|
|
|
|
2003-05-18 15:04:24 +00:00
|
|
|
|
(defun prepare-change-group (&optional buffer)
|
2002-02-06 15:20:36 +00:00
|
|
|
|
"Return a handle for the current buffer's state, for a change group.
|
2003-05-18 15:04:24 +00:00
|
|
|
|
If you specify BUFFER, make a handle for BUFFER's state instead.
|
2002-02-06 15:20:36 +00:00
|
|
|
|
|
|
|
|
|
Pass the handle to `activate-change-group' afterward to initiate
|
|
|
|
|
the actual changes of the change group.
|
|
|
|
|
|
|
|
|
|
To finish the change group, call either `accept-change-group' or
|
|
|
|
|
`cancel-change-group' passing the same handle as argument. Call
|
|
|
|
|
`accept-change-group' to accept the changes in the group as final;
|
|
|
|
|
call `cancel-change-group' to undo them all. You should use
|
|
|
|
|
`unwind-protect' to make sure the group is always finished. The call
|
|
|
|
|
to `activate-change-group' should be inside the `unwind-protect'.
|
|
|
|
|
Once you finish the group, don't use the handle again--don't try to
|
|
|
|
|
finish the same group twice. For a simple example of correct use, see
|
|
|
|
|
the source code of `atomic-change-group'.
|
|
|
|
|
|
|
|
|
|
The handle records only the specified buffer. To make a multibuffer
|
|
|
|
|
change group, call this function once for each buffer you want to
|
|
|
|
|
cover, then use `nconc' to combine the returned values, like this:
|
|
|
|
|
|
|
|
|
|
(nconc (prepare-change-group buffer-1)
|
|
|
|
|
(prepare-change-group buffer-2))
|
|
|
|
|
|
|
|
|
|
You can then activate that multibuffer change group with a single
|
|
|
|
|
call to `activate-change-group' and finish it with a single call
|
|
|
|
|
to `accept-change-group' or `cancel-change-group'."
|
|
|
|
|
|
2003-05-18 15:04:24 +00:00
|
|
|
|
(if buffer
|
|
|
|
|
(list (cons buffer (with-current-buffer buffer buffer-undo-list)))
|
|
|
|
|
(list (cons (current-buffer) buffer-undo-list))))
|
2002-02-06 15:20:36 +00:00
|
|
|
|
|
|
|
|
|
(defun activate-change-group (handle)
|
|
|
|
|
"Activate a change group made with `prepare-change-group' (which see)."
|
|
|
|
|
(dolist (elt handle)
|
|
|
|
|
(with-current-buffer (car elt)
|
|
|
|
|
(if (eq buffer-undo-list t)
|
|
|
|
|
(setq buffer-undo-list nil)))))
|
|
|
|
|
|
|
|
|
|
(defun accept-change-group (handle)
|
|
|
|
|
"Finish a change group made with `prepare-change-group' (which see).
|
|
|
|
|
This finishes the change group by accepting its changes as final."
|
|
|
|
|
(dolist (elt handle)
|
|
|
|
|
(with-current-buffer (car elt)
|
2012-04-23 15:48:22 +00:00
|
|
|
|
(if (eq (cdr elt) t)
|
2002-02-06 15:20:36 +00:00
|
|
|
|
(setq buffer-undo-list t)))))
|
|
|
|
|
|
|
|
|
|
(defun cancel-change-group (handle)
|
|
|
|
|
"Finish a change group made with `prepare-change-group' (which see).
|
|
|
|
|
This finishes the change group by reverting all of its changes."
|
|
|
|
|
(dolist (elt handle)
|
|
|
|
|
(with-current-buffer (car elt)
|
|
|
|
|
(setq elt (cdr elt))
|
2008-09-07 09:16:56 +00:00
|
|
|
|
(save-restriction
|
|
|
|
|
;; Widen buffer temporarily so if the buffer was narrowed within
|
|
|
|
|
;; the body of `atomic-change-group' all changes can be undone.
|
|
|
|
|
(widen)
|
|
|
|
|
(let ((old-car
|
|
|
|
|
(if (consp elt) (car elt)))
|
|
|
|
|
(old-cdr
|
|
|
|
|
(if (consp elt) (cdr elt))))
|
|
|
|
|
;; Temporarily truncate the undo log at ELT.
|
|
|
|
|
(when (consp elt)
|
|
|
|
|
(setcar elt nil) (setcdr elt nil))
|
|
|
|
|
(unless (eq last-command 'undo) (undo-start))
|
|
|
|
|
;; Make sure there's no confusion.
|
|
|
|
|
(when (and (consp elt) (not (eq elt (last pending-undo-list))))
|
|
|
|
|
(error "Undoing to some unrelated state"))
|
|
|
|
|
;; Undo it all.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(while (listp pending-undo-list) (undo-more 1)))
|
|
|
|
|
;; Reset the modified cons cell ELT to its original content.
|
|
|
|
|
(when (consp elt)
|
|
|
|
|
(setcar elt old-car)
|
|
|
|
|
(setcdr elt old-cdr))
|
|
|
|
|
;; Revert the undo info to what it was when we grabbed the state.
|
|
|
|
|
(setq buffer-undo-list elt))))))
|
2002-02-06 15:20:36 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Display-related functions.
|
|
|
|
|
|
2002-04-01 12:03:14 +00:00
|
|
|
|
;; For compatibility.
|
2012-06-02 10:56:09 +00:00
|
|
|
|
(define-obsolete-function-alias 'redraw-modeline
|
2012-08-15 16:29:11 +00:00
|
|
|
|
'force-mode-line-update "24.3")
|
2002-04-01 12:03:14 +00:00
|
|
|
|
|
2001-11-28 04:03:53 +00:00
|
|
|
|
(defun momentary-string-display (string pos &optional exit-char message)
|
1990-11-05 10:06:02 +00:00
|
|
|
|
"Momentarily display STRING in the buffer at POS.
|
2004-04-27 13:07:16 +00:00
|
|
|
|
Display remains until next event is input.
|
2007-01-02 23:49:25 +00:00
|
|
|
|
If POS is a marker, only its position is used; its buffer is ignored.
|
2004-04-27 13:07:16 +00:00
|
|
|
|
Optional third arg EXIT-CHAR can be a character, event or event
|
|
|
|
|
description list. EXIT-CHAR defaults to SPC. If the input is
|
|
|
|
|
EXIT-CHAR it is swallowed; otherwise it is then available as
|
|
|
|
|
input (as a command if nothing else).
|
1990-11-05 10:06:02 +00:00
|
|
|
|
Display MESSAGE (optional fourth arg) in the echo area.
|
|
|
|
|
If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there."
|
2006-11-27 14:05:58 +00:00
|
|
|
|
(or exit-char (setq exit-char ?\s))
|
2008-06-10 16:12:18 +00:00
|
|
|
|
(let ((ol (make-overlay pos pos))
|
2010-03-03 03:58:26 +00:00
|
|
|
|
(str (copy-sequence string)))
|
1990-11-05 10:06:02 +00:00
|
|
|
|
(unwind-protect
|
2008-06-10 16:12:18 +00:00
|
|
|
|
(progn
|
|
|
|
|
(save-excursion
|
2010-03-03 03:58:26 +00:00
|
|
|
|
(overlay-put ol 'after-string str)
|
2008-06-10 16:12:18 +00:00
|
|
|
|
(goto-char pos)
|
|
|
|
|
;; To avoid trouble with out-of-bounds position
|
|
|
|
|
(setq pos (point))
|
2010-03-03 03:58:26 +00:00
|
|
|
|
;; If the string end is off screen, recenter now.
|
2008-06-10 16:12:18 +00:00
|
|
|
|
(if (<= (window-end nil t) pos)
|
|
|
|
|
(recenter (/ (window-height) 2))))
|
|
|
|
|
(message (or message "Type %s to continue editing.")
|
|
|
|
|
(single-key-description exit-char))
|
2013-07-06 00:10:54 +00:00
|
|
|
|
(let ((event (read-key)))
|
2010-05-31 14:13:41 +00:00
|
|
|
|
;; `exit-char' can be an event, or an event description list.
|
|
|
|
|
(or (eq event exit-char)
|
|
|
|
|
(eq event (event-convert-list exit-char))
|
2013-07-06 00:10:54 +00:00
|
|
|
|
(setq unread-command-events
|
|
|
|
|
(append (this-single-command-raw-keys))))))
|
2008-06-10 16:12:18 +00:00
|
|
|
|
(delete-overlay ol))))
|
1990-11-05 10:06:02 +00:00
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2001-11-28 04:03:53 +00:00
|
|
|
|
;;;; Overlay operations
|
|
|
|
|
|
|
|
|
|
(defun copy-overlay (o)
|
|
|
|
|
"Return a copy of overlay O."
|
2010-02-11 19:35:36 +00:00
|
|
|
|
(let ((o1 (if (overlay-buffer o)
|
|
|
|
|
(make-overlay (overlay-start o) (overlay-end o)
|
|
|
|
|
;; FIXME: there's no easy way to find the
|
|
|
|
|
;; insertion-type of the two markers.
|
|
|
|
|
(overlay-buffer o))
|
|
|
|
|
(let ((o1 (make-overlay (point-min) (point-min))))
|
|
|
|
|
(delete-overlay o1)
|
2010-02-11 19:37:11 +00:00
|
|
|
|
o1)))
|
2001-11-28 04:03:53 +00:00
|
|
|
|
(props (overlay-properties o)))
|
|
|
|
|
(while props
|
|
|
|
|
(overlay-put o1 (pop props) (pop props)))
|
|
|
|
|
o1))
|
|
|
|
|
|
2004-04-27 21:00:31 +00:00
|
|
|
|
(defun remove-overlays (&optional beg end name val)
|
2001-11-28 04:03:53 +00:00
|
|
|
|
"Clear BEG and END of overlays whose property NAME has value VAL.
|
2004-05-09 22:15:14 +00:00
|
|
|
|
Overlays might be moved and/or split.
|
|
|
|
|
BEG and END default respectively to the beginning and end of buffer."
|
2006-11-08 17:31:46 +00:00
|
|
|
|
;; This speeds up the loops over overlays.
|
2004-04-27 21:00:31 +00:00
|
|
|
|
(unless beg (setq beg (point-min)))
|
|
|
|
|
(unless end (setq end (point-max)))
|
2006-11-12 19:55:58 +00:00
|
|
|
|
(overlay-recenter end)
|
2001-11-28 04:03:53 +00:00
|
|
|
|
(if (< end beg)
|
|
|
|
|
(setq beg (prog1 end (setq end beg))))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(dolist (o (overlays-in beg end))
|
|
|
|
|
(when (eq (overlay-get o name) val)
|
|
|
|
|
;; Either push this overlay outside beg...end
|
|
|
|
|
;; or split it to exclude beg...end
|
|
|
|
|
;; or delete it entirely (if it is contained in beg...end).
|
|
|
|
|
(if (< (overlay-start o) beg)
|
|
|
|
|
(if (> (overlay-end o) end)
|
|
|
|
|
(progn
|
|
|
|
|
(move-overlay (copy-overlay o)
|
|
|
|
|
(overlay-start o) beg)
|
|
|
|
|
(move-overlay o end (overlay-end o)))
|
|
|
|
|
(move-overlay o (overlay-start o) beg))
|
|
|
|
|
(if (> (overlay-end o) end)
|
|
|
|
|
(move-overlay o end (overlay-end o))
|
|
|
|
|
(delete-overlay o)))))))
|
2002-01-23 17:46:44 +00:00
|
|
|
|
|
1993-04-10 06:21:55 +00:00
|
|
|
|
;;;; Miscellanea.
|
|
|
|
|
|
1998-02-04 21:04:41 +00:00
|
|
|
|
(defvar suspend-hook nil
|
|
|
|
|
"Normal hook run by `suspend-emacs', before suspending.")
|
|
|
|
|
|
|
|
|
|
(defvar suspend-resume-hook nil
|
|
|
|
|
"Normal hook run by `suspend-emacs', after Emacs is continued.")
|
|
|
|
|
|
2001-12-16 18:36:50 +00:00
|
|
|
|
(defvar temp-buffer-show-hook nil
|
|
|
|
|
"Normal hook run by `with-output-to-temp-buffer' after displaying the buffer.
|
|
|
|
|
When the hook runs, the temporary buffer is current, and the window it
|
2008-08-23 03:02:23 +00:00
|
|
|
|
was displayed in is selected.")
|
2001-12-16 18:36:50 +00:00
|
|
|
|
|
|
|
|
|
(defvar temp-buffer-setup-hook nil
|
|
|
|
|
"Normal hook run by `with-output-to-temp-buffer' at the start.
|
|
|
|
|
When the hook runs, the temporary buffer is current.
|
|
|
|
|
This hook is normally set up with a function to put the buffer in Help
|
|
|
|
|
mode.")
|
|
|
|
|
|
2007-06-13 00:03:28 +00:00
|
|
|
|
(defconst user-emacs-directory
|
|
|
|
|
(if (eq system-type 'ms-dos)
|
|
|
|
|
;; MS-DOS cannot have initial dot.
|
|
|
|
|
"~/_emacs.d/"
|
|
|
|
|
"~/.emacs.d/")
|
|
|
|
|
"Directory beneath which additional per-user Emacs-specific files are placed.
|
|
|
|
|
Various programs in Emacs store information in this directory.
|
2008-10-24 09:39:27 +00:00
|
|
|
|
Note that this should end with a directory separator.
|
|
|
|
|
See also `locate-user-emacs-file'.")
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
;;;; Misc. useful functions.
|
1994-12-25 22:20:06 +00:00
|
|
|
|
|
2012-09-07 08:58:31 +00:00
|
|
|
|
(defsubst buffer-narrowed-p ()
|
|
|
|
|
"Return non-nil if the current buffer is narrowed."
|
|
|
|
|
(/= (- (point-max) (point-min)) (buffer-size)))
|
|
|
|
|
|
2013-06-03 08:51:50 +00:00
|
|
|
|
(defun find-tag-default-bounds ()
|
|
|
|
|
"Determine the boundaries of the default tag, based on text at point.
|
|
|
|
|
Return a cons cell with the beginning and end of the found tag.
|
2005-10-22 15:01:08 +00:00
|
|
|
|
If there is no plausible default, return nil."
|
2008-01-26 17:07:59 +00:00
|
|
|
|
(let (from to bound)
|
|
|
|
|
(when (or (progn
|
|
|
|
|
;; Look at text around `point'.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-syntax-backward "w_") (setq from (point)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-syntax-forward "w_") (setq to (point)))
|
|
|
|
|
(> to from))
|
|
|
|
|
;; Look between `line-beginning-position' and `point'.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(and (setq bound (line-beginning-position))
|
|
|
|
|
(skip-syntax-backward "^w_" bound)
|
|
|
|
|
(> (setq to (point)) bound)
|
|
|
|
|
(skip-syntax-backward "w_")
|
|
|
|
|
(setq from (point))))
|
|
|
|
|
;; Look between `point' and `line-end-position'.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(and (setq bound (line-end-position))
|
|
|
|
|
(skip-syntax-forward "^w_" bound)
|
|
|
|
|
(< (setq from (point)) bound)
|
|
|
|
|
(skip-syntax-forward "w_")
|
|
|
|
|
(setq to (point)))))
|
2013-06-03 08:51:50 +00:00
|
|
|
|
(cons from to))))
|
|
|
|
|
|
|
|
|
|
(defun find-tag-default ()
|
|
|
|
|
"Determine default tag to search for, based on text at point.
|
|
|
|
|
If there is no plausible default, return nil."
|
|
|
|
|
(let ((bounds (find-tag-default-bounds)))
|
|
|
|
|
(when bounds
|
|
|
|
|
(buffer-substring-no-properties (car bounds) (cdr bounds)))))
|
1996-02-08 10:04:55 +00:00
|
|
|
|
|
2013-03-08 04:18:16 +00:00
|
|
|
|
(defun find-tag-default-as-regexp ()
|
|
|
|
|
"Return regexp that matches the default tag at point.
|
|
|
|
|
If there is no tag at point, return nil.
|
|
|
|
|
|
2013-03-08 08:11:59 +00:00
|
|
|
|
When in a major mode that does not provide its own
|
2013-03-08 04:18:16 +00:00
|
|
|
|
`find-tag-default-function', return a regexp that matches the
|
|
|
|
|
symbol at point exactly."
|
2013-12-20 19:55:56 +00:00
|
|
|
|
(let ((tag (funcall (or find-tag-default-function
|
|
|
|
|
(get major-mode 'find-tag-default-function)
|
|
|
|
|
'find-tag-default))))
|
|
|
|
|
(if tag (regexp-quote tag))))
|
|
|
|
|
|
|
|
|
|
(defun find-tag-default-as-symbol-regexp ()
|
|
|
|
|
"Return regexp that matches the default tag at point as symbol.
|
|
|
|
|
If there is no tag at point, return nil.
|
|
|
|
|
|
|
|
|
|
When in a major mode that does not provide its own
|
|
|
|
|
`find-tag-default-function', return a regexp that matches the
|
|
|
|
|
symbol at point exactly."
|
|
|
|
|
(let ((tag-regexp (find-tag-default-as-regexp)))
|
|
|
|
|
(if (and tag-regexp
|
|
|
|
|
(eq (or find-tag-default-function
|
|
|
|
|
(get major-mode 'find-tag-default-function)
|
|
|
|
|
'find-tag-default)
|
|
|
|
|
'find-tag-default))
|
|
|
|
|
(format "\\_<%s\\_>" tag-regexp)
|
|
|
|
|
tag-regexp)))
|
2013-03-08 04:18:16 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun play-sound (sound)
|
|
|
|
|
"SOUND is a list of the form `(sound KEYWORD VALUE...)'.
|
|
|
|
|
The following keywords are recognized:
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
:file FILE - read sound data from FILE. If FILE isn't an
|
|
|
|
|
absolute file name, it is searched in `data-directory'.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
:data DATA - read sound data from string DATA.
|
|
|
|
|
|
|
|
|
|
Exactly one of :file or :data must be present.
|
|
|
|
|
|
|
|
|
|
:volume VOL - set volume to VOL. VOL must an integer in the
|
|
|
|
|
range 0..100 or a float in the range 0..1.0. If not specified,
|
|
|
|
|
don't change the volume setting of the sound device.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
:device DEVICE - play sound on DEVICE. If not specified,
|
2009-01-12 20:34:48 +00:00
|
|
|
|
a system-dependent default device name is used.
|
|
|
|
|
|
|
|
|
|
Note: :data and :device are currently not supported on Windows."
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(if (fboundp 'play-sound-internal)
|
|
|
|
|
(play-sound-internal sound)
|
|
|
|
|
(error "This Emacs binary lacks sound support")))
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2007-11-19 00:09:48 +00:00
|
|
|
|
(declare-function w32-shell-dos-semantics "w32-fns" nil)
|
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun shell-quote-argument (argument)
|
2009-01-12 20:34:48 +00:00
|
|
|
|
"Quote ARGUMENT for passing as argument to an inferior shell."
|
2011-04-26 10:44:03 +00:00
|
|
|
|
(cond
|
|
|
|
|
((eq system-type 'ms-dos)
|
|
|
|
|
;; Quote using double quotes, but escape any existing quotes in
|
|
|
|
|
;; the argument with backslashes.
|
|
|
|
|
(let ((result "")
|
|
|
|
|
(start 0)
|
|
|
|
|
end)
|
|
|
|
|
(if (or (null (string-match "[^\"]" argument))
|
|
|
|
|
(< (match-end 0) (length argument)))
|
|
|
|
|
(while (string-match "[\"]" argument start)
|
|
|
|
|
(setq end (match-beginning 0)
|
|
|
|
|
result (concat result (substring argument start end)
|
|
|
|
|
"\\" (substring argument end (1+ end)))
|
|
|
|
|
start (1+ end))))
|
|
|
|
|
(concat "\"" result (substring argument start) "\"")))
|
|
|
|
|
|
|
|
|
|
((and (eq system-type 'windows-nt) (w32-shell-dos-semantics))
|
2011-04-28 19:35:20 +00:00
|
|
|
|
|
2011-04-26 10:44:03 +00:00
|
|
|
|
;; First, quote argument so that CommandLineToArgvW will
|
|
|
|
|
;; understand it. See
|
|
|
|
|
;; http://msdn.microsoft.com/en-us/library/17w5ykft%28v=vs.85%29.aspx
|
|
|
|
|
;; After we perform that level of quoting, escape shell
|
|
|
|
|
;; metacharacters so that cmd won't mangle our argument. If the
|
|
|
|
|
;; argument contains no double quote characters, we can just
|
|
|
|
|
;; surround it with double quotes. Otherwise, we need to prefix
|
|
|
|
|
;; each shell metacharacter with a caret.
|
|
|
|
|
|
|
|
|
|
(setq argument
|
|
|
|
|
;; escape backslashes at end of string
|
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"\\(\\\\*\\)$"
|
|
|
|
|
"\\1\\1"
|
|
|
|
|
;; escape backslashes and quotes in string body
|
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"\\(\\\\*\\)\""
|
|
|
|
|
"\\1\\1\\\\\""
|
|
|
|
|
argument)))
|
|
|
|
|
|
2011-04-27 07:56:55 +00:00
|
|
|
|
(if (string-match "[%!\"]" argument)
|
2011-04-26 10:44:03 +00:00
|
|
|
|
(concat
|
|
|
|
|
"^\""
|
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"\\([%!()\"<>&|^]\\)"
|
|
|
|
|
"^\\1"
|
|
|
|
|
argument)
|
|
|
|
|
"^\"")
|
|
|
|
|
(concat "\"" argument "\"")))
|
|
|
|
|
|
|
|
|
|
(t
|
2006-09-25 23:03:39 +00:00
|
|
|
|
(if (equal argument "")
|
|
|
|
|
"''"
|
|
|
|
|
;; Quote everything except POSIX filename characters.
|
|
|
|
|
;; This should be safe enough even for really weird shells.
|
2011-04-26 10:44:03 +00:00
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"\n" "'\n'"
|
|
|
|
|
(replace-regexp-in-string "[^-0-9a-zA-Z_./\n]" "\\\\\\&" argument))))
|
|
|
|
|
))
|
2006-04-06 19:20:38 +00:00
|
|
|
|
|
|
|
|
|
(defun string-or-null-p (object)
|
|
|
|
|
"Return t if OBJECT is a string or nil.
|
|
|
|
|
Otherwise, return nil."
|
|
|
|
|
(or (stringp object) (null object)))
|
|
|
|
|
|
2006-04-29 13:56:19 +00:00
|
|
|
|
(defun booleanp (object)
|
2010-10-03 01:11:20 +00:00
|
|
|
|
"Return t if OBJECT is one of the two canonical boolean values: t or nil.
|
|
|
|
|
Otherwise, return nil."
|
|
|
|
|
(and (memq object '(nil t)) t))
|
2006-04-29 13:56:19 +00:00
|
|
|
|
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(defun special-form-p (object)
|
|
|
|
|
"Non-nil if and only if OBJECT is a special form."
|
|
|
|
|
(if (and (symbolp object) (fboundp object))
|
2012-12-31 04:43:35 +00:00
|
|
|
|
(setq object (indirect-function object t)))
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 20:43:43 +00:00
|
|
|
|
(and (subrp object) (eq (cdr (subr-arity object)) 'unevalled)))
|
|
|
|
|
|
2013-08-04 20:18:11 +00:00
|
|
|
|
(defun macrop (object)
|
|
|
|
|
"Non-nil if and only if OBJECT is a macro."
|
|
|
|
|
(let ((def (indirect-function object t)))
|
|
|
|
|
(when (consp def)
|
|
|
|
|
(or (eq 'macro (car def))
|
2013-08-07 15:43:57 +00:00
|
|
|
|
(and (autoloadp def) (memq (nth 4 def) '(macro t)))))))
|
2013-08-04 20:18:11 +00:00
|
|
|
|
|
2006-05-10 01:58:37 +00:00
|
|
|
|
(defun field-at-pos (pos)
|
2009-01-12 20:34:48 +00:00
|
|
|
|
"Return the field at position POS, taking stickiness etc into account."
|
2006-05-10 00:32:34 +00:00
|
|
|
|
(let ((raw-field (get-char-property (field-beginning pos) 'field)))
|
|
|
|
|
(if (eq raw-field 'boundary)
|
|
|
|
|
(get-char-property (1- (field-end pos)) 'field)
|
|
|
|
|
raw-field)))
|
|
|
|
|
|
2011-06-21 08:55:22 +00:00
|
|
|
|
(defun sha1 (object &optional start end binary)
|
|
|
|
|
"Return the SHA1 (Secure Hash Algorithm) of an OBJECT.
|
|
|
|
|
OBJECT is either a string or a buffer. Optional arguments START and
|
|
|
|
|
END are character positions specifying which portion of OBJECT for
|
|
|
|
|
computing the hash. If BINARY is non-nil, return a string in binary
|
|
|
|
|
form."
|
|
|
|
|
(secure-hash 'sha1 object start end binary))
|
|
|
|
|
|
2012-07-26 01:27:33 +00:00
|
|
|
|
(defun function-get (f prop &optional autoload)
|
|
|
|
|
"Return the value of property PROP of function F.
|
2012-08-13 21:23:09 +00:00
|
|
|
|
If AUTOLOAD is non-nil and F is autoloaded, try to autoload it
|
|
|
|
|
in the hope that it will set PROP. If AUTOLOAD is `macro', only do it
|
|
|
|
|
if it's an autoloaded macro."
|
2012-07-26 01:27:33 +00:00
|
|
|
|
(let ((val nil))
|
|
|
|
|
(while (and (symbolp f)
|
|
|
|
|
(null (setq val (get f prop)))
|
|
|
|
|
(fboundp f))
|
|
|
|
|
(let ((fundef (symbol-function f)))
|
|
|
|
|
(if (and autoload (autoloadp fundef)
|
2012-08-13 21:23:09 +00:00
|
|
|
|
(not (equal fundef
|
|
|
|
|
(autoload-do-load fundef f
|
|
|
|
|
(if (eq autoload 'macro)
|
|
|
|
|
'macro)))))
|
2012-07-26 01:27:33 +00:00
|
|
|
|
nil ;Re-try `get' on the same `f'.
|
|
|
|
|
(setq f fundef))))
|
|
|
|
|
val))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
;;;; Support for yanking and text properties.
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
|
;; Why here in subr.el rather than in simple.el? --Stef
|
1993-04-10 06:21:55 +00:00
|
|
|
|
|
2012-08-18 05:11:38 +00:00
|
|
|
|
(defvar yank-handled-properties)
|
2002-04-19 00:06:54 +00:00
|
|
|
|
(defvar yank-excluded-properties)
|
|
|
|
|
|
2002-04-29 21:06:51 +00:00
|
|
|
|
(defun remove-yank-excluded-properties (start end)
|
2012-08-18 05:11:38 +00:00
|
|
|
|
"Process text properties between START and END, inserted for a `yank'.
|
|
|
|
|
Perform the handling specified by `yank-handled-properties', then
|
|
|
|
|
remove properties specified by `yank-excluded-properties'."
|
2002-04-29 21:06:51 +00:00
|
|
|
|
(let ((inhibit-read-only t))
|
2012-08-18 05:11:38 +00:00
|
|
|
|
(dolist (handler yank-handled-properties)
|
|
|
|
|
(let ((prop (car handler))
|
|
|
|
|
(fun (cdr handler))
|
|
|
|
|
(run-start start))
|
|
|
|
|
(while (< run-start end)
|
|
|
|
|
(let ((value (get-text-property run-start prop))
|
|
|
|
|
(run-end (next-single-property-change
|
|
|
|
|
run-start prop nil end)))
|
|
|
|
|
(funcall fun value run-start run-end)
|
|
|
|
|
(setq run-start run-end)))))
|
2002-04-29 21:06:51 +00:00
|
|
|
|
(if (eq yank-excluded-properties t)
|
|
|
|
|
(set-text-properties start end nil)
|
2002-09-29 03:31:15 +00:00
|
|
|
|
(remove-list-of-text-properties start end yank-excluded-properties))))
|
2002-04-29 21:06:51 +00:00
|
|
|
|
|
2003-01-18 23:35:06 +00:00
|
|
|
|
(defvar yank-undo-function)
|
|
|
|
|
|
|
|
|
|
(defun insert-for-yank (string)
|
2011-01-11 03:23:04 +00:00
|
|
|
|
"Call `insert-for-yank-1' repetitively for each `yank-handler' segment.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
|
|
|
|
See `insert-for-yank-1' for more details."
|
|
|
|
|
(let (to)
|
|
|
|
|
(while (setq to (next-single-property-change 0 'yank-handler string))
|
|
|
|
|
(insert-for-yank-1 (substring string 0 to))
|
|
|
|
|
(setq string (substring string to))))
|
|
|
|
|
(insert-for-yank-1 string))
|
|
|
|
|
|
|
|
|
|
(defun insert-for-yank-1 (string)
|
2012-08-18 05:11:38 +00:00
|
|
|
|
"Insert STRING at point for the `yank' command.
|
|
|
|
|
This function is like `insert', except it honors the variables
|
|
|
|
|
`yank-handled-properties' and `yank-excluded-properties', and the
|
|
|
|
|
`yank-handler' text property.
|
|
|
|
|
|
|
|
|
|
Properties listed in `yank-handled-properties' are processed,
|
|
|
|
|
then those listed in `yank-excluded-properties' are discarded.
|
|
|
|
|
|
|
|
|
|
If STRING has a non-nil `yank-handler' property on its first
|
|
|
|
|
character, the normal insert behavior is altered. The value of
|
|
|
|
|
the `yank-handler' property must be a list of one to four
|
|
|
|
|
elements, of the form (FUNCTION PARAM NOEXCLUDE UNDO).
|
|
|
|
|
FUNCTION, if non-nil, should be a function of one argument, an
|
|
|
|
|
object to insert; it is called instead of `insert'.
|
|
|
|
|
PARAM, if present and non-nil, replaces STRING as the argument to
|
|
|
|
|
FUNCTION or `insert'; e.g. if FUNCTION is `yank-rectangle', PARAM
|
|
|
|
|
may be a list of strings to insert as a rectangle.
|
|
|
|
|
If NOEXCLUDE is present and non-nil, the normal removal of
|
2010-12-11 02:34:55 +00:00
|
|
|
|
`yank-excluded-properties' is not performed; instead FUNCTION is
|
2012-08-18 05:11:38 +00:00
|
|
|
|
responsible for the removal. This may be necessary if FUNCTION
|
|
|
|
|
adjusts point before or after inserting the object.
|
|
|
|
|
UNDO, if present and non-nil, should be a function to be called
|
2003-01-18 23:35:06 +00:00
|
|
|
|
by `yank-pop' to undo the insertion of the current object. It is
|
2012-08-18 05:11:38 +00:00
|
|
|
|
given two arguments, the start and end of the region. FUNCTION
|
|
|
|
|
may set `yank-undo-function' to override UNDO."
|
2003-01-19 01:07:34 +00:00
|
|
|
|
(let* ((handler (and (stringp string)
|
|
|
|
|
(get-text-property 0 'yank-handler string)))
|
|
|
|
|
(param (or (nth 1 handler) string))
|
2006-09-28 19:06:39 +00:00
|
|
|
|
(opoint (point))
|
2007-02-09 23:09:16 +00:00
|
|
|
|
(inhibit-read-only inhibit-read-only)
|
2006-09-28 19:06:39 +00:00
|
|
|
|
end)
|
|
|
|
|
|
2003-01-19 01:07:34 +00:00
|
|
|
|
(setq yank-undo-function t)
|
2012-08-18 05:11:38 +00:00
|
|
|
|
(if (nth 0 handler) ; FUNCTION
|
2003-01-19 01:07:34 +00:00
|
|
|
|
(funcall (car handler) param)
|
2003-01-18 23:35:06 +00:00
|
|
|
|
(insert param))
|
2006-09-28 19:06:39 +00:00
|
|
|
|
(setq end (point))
|
|
|
|
|
|
2007-02-09 23:09:16 +00:00
|
|
|
|
;; Prevent read-only properties from interfering with the
|
|
|
|
|
;; following text property changes.
|
|
|
|
|
(setq inhibit-read-only t)
|
|
|
|
|
|
2012-08-18 05:11:38 +00:00
|
|
|
|
(unless (nth 2 handler) ; NOEXCLUDE
|
|
|
|
|
(remove-yank-excluded-properties opoint end))
|
2006-10-18 10:56:46 +00:00
|
|
|
|
|
|
|
|
|
;; If last inserted char has properties, mark them as rear-nonsticky.
|
|
|
|
|
(if (and (> end opoint)
|
|
|
|
|
(text-properties-at (1- end)))
|
|
|
|
|
(put-text-property (1- end) end 'rear-nonsticky t))
|
|
|
|
|
|
2012-08-18 05:11:38 +00:00
|
|
|
|
(if (eq yank-undo-function t) ; not set by FUNCTION
|
|
|
|
|
(setq yank-undo-function (nth 3 handler))) ; UNDO
|
|
|
|
|
(if (nth 4 handler) ; COMMAND
|
2003-01-19 01:07:34 +00:00
|
|
|
|
(setq this-command (nth 4 handler)))))
|
2003-02-04 12:29:42 +00:00
|
|
|
|
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(defun insert-buffer-substring-no-properties (buffer &optional start end)
|
|
|
|
|
"Insert before point a substring of BUFFER, without text properties.
|
2002-04-21 17:00:41 +00:00
|
|
|
|
BUFFER may be a buffer or a buffer name.
|
2004-06-07 20:54:42 +00:00
|
|
|
|
Arguments START and END are character positions specifying the substring.
|
|
|
|
|
They default to the values of (point-min) and (point-max) in BUFFER."
|
2002-04-21 17:00:41 +00:00
|
|
|
|
(let ((opoint (point)))
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(insert-buffer-substring buffer start end)
|
2002-04-21 17:00:41 +00:00
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(set-text-properties opoint (point) nil))))
|
|
|
|
|
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(defun insert-buffer-substring-as-yank (buffer &optional start end)
|
|
|
|
|
"Insert before point a part of BUFFER, stripping some text properties.
|
|
|
|
|
BUFFER may be a buffer or a buffer name.
|
2004-06-07 20:54:42 +00:00
|
|
|
|
Arguments START and END are character positions specifying the substring.
|
|
|
|
|
They default to the values of (point-min) and (point-max) in BUFFER.
|
2012-10-27 05:03:52 +00:00
|
|
|
|
Before insertion, process text properties according to
|
|
|
|
|
`yank-handled-properties' and `yank-excluded-properties'."
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;; Since the buffer text should not normally have yank-handler properties,
|
|
|
|
|
;; there is no need to handle them here.
|
2002-04-21 17:00:41 +00:00
|
|
|
|
(let ((opoint (point)))
|
2004-05-07 01:06:20 +00:00
|
|
|
|
(insert-buffer-substring buffer start end)
|
2002-04-29 21:06:51 +00:00
|
|
|
|
(remove-yank-excluded-properties opoint (point))))
|
2002-04-21 17:00:41 +00:00
|
|
|
|
|
2012-08-18 05:11:38 +00:00
|
|
|
|
(defun yank-handle-font-lock-face-property (face start end)
|
|
|
|
|
"If `font-lock-defaults' is nil, apply FACE as a `face' property.
|
|
|
|
|
START and END denote the start and end of the text to act on.
|
|
|
|
|
Do nothing if FACE is nil."
|
|
|
|
|
(and face
|
|
|
|
|
(null font-lock-defaults)
|
|
|
|
|
(put-text-property start end 'face face)))
|
|
|
|
|
|
|
|
|
|
;; This removes `mouse-face' properties in *Help* buffer buttons:
|
|
|
|
|
;; http://lists.gnu.org/archive/html/emacs-devel/2002-04/msg00648.html
|
|
|
|
|
(defun yank-handle-category-property (category start end)
|
|
|
|
|
"Apply property category CATEGORY's properties between START and END."
|
|
|
|
|
(when category
|
|
|
|
|
(let ((start2 start))
|
|
|
|
|
(while (< start2 end)
|
|
|
|
|
(let ((end2 (next-property-change start2 nil end))
|
|
|
|
|
(original (text-properties-at start2)))
|
|
|
|
|
(set-text-properties start2 end2 (symbol-plist category))
|
|
|
|
|
(add-text-properties start2 end2 original)
|
|
|
|
|
(setq start2 end2))))))
|
|
|
|
|
|
2002-04-19 00:06:54 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Synchronous shell commands.
|
2002-04-19 00:06:54 +00:00
|
|
|
|
|
1990-11-05 10:06:02 +00:00
|
|
|
|
(defun start-process-shell-command (name buffer &rest args)
|
|
|
|
|
"Start a program in a subprocess. Return the process object for it.
|
|
|
|
|
NAME is name for process. It is modified if necessary to make it unique.
|
2004-05-10 17:44:56 +00:00
|
|
|
|
BUFFER is the buffer (or buffer name) to associate with the process.
|
1990-11-05 10:06:02 +00:00
|
|
|
|
Process output goes at end of that buffer, unless you specify
|
|
|
|
|
an output stream or filter function to handle the output.
|
|
|
|
|
BUFFER may be also nil, meaning that this process is not associated
|
|
|
|
|
with any buffer
|
2009-08-19 03:03:05 +00:00
|
|
|
|
COMMAND is the shell command to run.
|
|
|
|
|
|
|
|
|
|
An old calling convention accepted any number of arguments after COMMAND,
|
|
|
|
|
which were just concatenated to COMMAND. This is still supported but strongly
|
2009-10-16 03:21:18 +00:00
|
|
|
|
discouraged."
|
1994-11-19 14:06:09 +00:00
|
|
|
|
;; We used to use `exec' to replace the shell with the command,
|
|
|
|
|
;; but that failed to handle (...) and semicolon, etc.
|
2008-07-31 05:33:56 +00:00
|
|
|
|
(start-process name buffer shell-file-name shell-command-switch
|
|
|
|
|
(mapconcat 'identity args " ")))
|
2009-10-16 05:03:56 +00:00
|
|
|
|
(set-advertised-calling-convention 'start-process-shell-command
|
2010-09-14 11:11:44 +00:00
|
|
|
|
'(name buffer command) "23.1")
|
2009-10-16 05:03:56 +00:00
|
|
|
|
|
2007-07-24 20:49:18 +00:00
|
|
|
|
(defun start-file-process-shell-command (name buffer &rest args)
|
|
|
|
|
"Start a program in a subprocess. Return the process object for it.
|
2009-10-16 03:21:18 +00:00
|
|
|
|
Similar to `start-process-shell-command', but calls `start-file-process'."
|
2007-07-24 20:49:18 +00:00
|
|
|
|
(start-file-process
|
|
|
|
|
name buffer
|
|
|
|
|
(if (file-remote-p default-directory) "/bin/sh" shell-file-name)
|
|
|
|
|
(if (file-remote-p default-directory) "-c" shell-command-switch)
|
|
|
|
|
(mapconcat 'identity args " ")))
|
2009-10-16 05:03:56 +00:00
|
|
|
|
(set-advertised-calling-convention 'start-file-process-shell-command
|
2010-09-14 11:11:44 +00:00
|
|
|
|
'(name buffer command) "23.1")
|
2007-07-24 20:49:18 +00:00
|
|
|
|
|
2001-10-05 12:30:20 +00:00
|
|
|
|
(defun call-process-shell-command (command &optional infile buffer display
|
|
|
|
|
&rest args)
|
|
|
|
|
"Execute the shell command COMMAND synchronously in separate process.
|
|
|
|
|
The remaining arguments are optional.
|
|
|
|
|
The program's input comes from file INFILE (nil means `/dev/null').
|
|
|
|
|
Insert output in BUFFER before point; t means current buffer;
|
|
|
|
|
nil for BUFFER means discard it; 0 means discard and don't wait.
|
|
|
|
|
BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
|
|
|
|
|
REAL-BUFFER says what to do with standard output, as above,
|
|
|
|
|
while STDERR-FILE says what to do with standard error in the child.
|
|
|
|
|
STDERR-FILE may be nil (discard standard error output),
|
|
|
|
|
t (mix it with ordinary output), or a file name string.
|
|
|
|
|
|
|
|
|
|
Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted.
|
|
|
|
|
Remaining arguments are strings passed as additional arguments for COMMAND.
|
|
|
|
|
Wildcards and redirection are handled as usual in the shell.
|
|
|
|
|
|
|
|
|
|
If BUFFER is 0, `call-process-shell-command' returns immediately with value nil.
|
|
|
|
|
Otherwise it waits for COMMAND to terminate and returns a numeric exit
|
|
|
|
|
status or a signal description string.
|
|
|
|
|
If you quit, the process is killed with SIGINT, or SIGKILL if you quit again."
|
2008-07-31 05:33:56 +00:00
|
|
|
|
;; We used to use `exec' to replace the shell with the command,
|
|
|
|
|
;; but that failed to handle (...) and semicolon, etc.
|
|
|
|
|
(call-process shell-file-name
|
|
|
|
|
infile buffer display
|
|
|
|
|
shell-command-switch
|
|
|
|
|
(mapconcat 'identity (cons command args) " ")))
|
2007-07-24 20:49:18 +00:00
|
|
|
|
|
|
|
|
|
(defun process-file-shell-command (command &optional infile buffer display
|
|
|
|
|
&rest args)
|
|
|
|
|
"Process files synchronously in a separate process.
|
|
|
|
|
Similar to `call-process-shell-command', but calls `process-file'."
|
|
|
|
|
(process-file
|
|
|
|
|
(if (file-remote-p default-directory) "/bin/sh" shell-file-name)
|
|
|
|
|
infile buffer display
|
|
|
|
|
(if (file-remote-p default-directory) "-c" shell-command-switch)
|
|
|
|
|
(mapconcat 'identity (cons command args) " ")))
|
1996-09-28 04:16:00 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Lisp macros to do various things temporarily.
|
|
|
|
|
|
2008-10-25 09:18:19 +00:00
|
|
|
|
(defmacro with-current-buffer (buffer-or-name &rest body)
|
|
|
|
|
"Execute the forms in BODY with BUFFER-OR-NAME temporarily current.
|
|
|
|
|
BUFFER-OR-NAME must be a buffer or the name of an existing buffer.
|
|
|
|
|
The value returned is the value of the last form in BODY. See
|
|
|
|
|
also `with-temp-buffer'."
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 1) (debug t))
|
|
|
|
|
`(save-current-buffer
|
2008-10-25 09:18:19 +00:00
|
|
|
|
(set-buffer ,buffer-or-name)
|
2003-05-17 22:00:40 +00:00
|
|
|
|
,@body))
|
|
|
|
|
|
2012-08-13 14:12:47 +00:00
|
|
|
|
(defun internal--before-with-selected-window (window)
|
2012-08-12 22:52:33 +00:00
|
|
|
|
(let ((other-frame (window-frame window)))
|
|
|
|
|
(list window (selected-window)
|
|
|
|
|
;; Selecting a window on another frame also changes that
|
|
|
|
|
;; frame's frame-selected-window. We must save&restore it.
|
|
|
|
|
(unless (eq (selected-frame) other-frame)
|
|
|
|
|
(frame-selected-window other-frame))
|
|
|
|
|
;; Also remember the top-frame if on ttys.
|
|
|
|
|
(unless (eq (selected-frame) other-frame)
|
|
|
|
|
(tty-top-frame other-frame)))))
|
|
|
|
|
|
2012-08-13 14:12:47 +00:00
|
|
|
|
(defun internal--after-with-selected-window (state)
|
2012-08-12 22:52:33 +00:00
|
|
|
|
;; First reset frame-selected-window.
|
|
|
|
|
(when (window-live-p (nth 2 state))
|
|
|
|
|
;; We don't use set-frame-selected-window because it does not
|
|
|
|
|
;; pass the `norecord' argument to Fselect_window.
|
|
|
|
|
(select-window (nth 2 state) 'norecord)
|
|
|
|
|
(and (frame-live-p (nth 3 state))
|
|
|
|
|
(not (eq (tty-top-frame) (nth 3 state)))
|
|
|
|
|
(select-frame (nth 3 state) 'norecord)))
|
|
|
|
|
;; Then reset the actual selected-window.
|
2012-08-14 04:37:00 +00:00
|
|
|
|
(when (window-live-p (nth 1 state))
|
|
|
|
|
(select-window (nth 1 state) 'norecord)))
|
2012-08-12 22:52:33 +00:00
|
|
|
|
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(defmacro with-selected-window (window &rest body)
|
|
|
|
|
"Execute the forms in BODY with WINDOW as the selected window.
|
|
|
|
|
The value returned is the value of the last form in BODY.
|
2005-06-25 14:04:18 +00:00
|
|
|
|
|
2008-11-02 11:02:58 +00:00
|
|
|
|
This macro saves and restores the selected window, as well as the
|
|
|
|
|
selected window of each frame. It does not change the order of
|
|
|
|
|
recently selected windows. If the previously selected window of
|
|
|
|
|
some frame is no longer live at the end of BODY, that frame's
|
|
|
|
|
selected window is left alone. If the selected window is no
|
|
|
|
|
longer live, then whatever window is selected at the end of BODY
|
|
|
|
|
remains selected.
|
|
|
|
|
|
|
|
|
|
This macro uses `save-current-buffer' to save and restore the
|
|
|
|
|
current buffer, since otherwise its normal operation could
|
|
|
|
|
potentially make a different buffer current. It does not alter
|
|
|
|
|
the buffer list ordering."
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 1) (debug t))
|
2012-08-12 22:52:33 +00:00
|
|
|
|
`(let ((save-selected-window--state
|
2012-08-13 14:12:47 +00:00
|
|
|
|
(internal--before-with-selected-window ,window)))
|
2005-06-25 14:04:18 +00:00
|
|
|
|
(save-current-buffer
|
|
|
|
|
(unwind-protect
|
2012-08-12 22:52:33 +00:00
|
|
|
|
(progn (select-window (car save-selected-window--state) 'norecord)
|
2005-06-25 14:04:18 +00:00
|
|
|
|
,@body)
|
2012-08-13 14:12:47 +00:00
|
|
|
|
(internal--after-with-selected-window save-selected-window--state)))))
|
1996-09-22 04:40:37 +00:00
|
|
|
|
|
2004-05-23 02:26:21 +00:00
|
|
|
|
(defmacro with-selected-frame (frame &rest body)
|
|
|
|
|
"Execute the forms in BODY with FRAME as the selected frame.
|
|
|
|
|
The value returned is the value of the last form in BODY.
|
2008-11-02 11:02:58 +00:00
|
|
|
|
|
2012-01-07 05:57:57 +00:00
|
|
|
|
This macro saves and restores the selected frame, and changes the
|
|
|
|
|
order of neither the recently selected windows nor the buffers in
|
|
|
|
|
the buffer list."
|
2004-05-23 02:26:21 +00:00
|
|
|
|
(declare (indent 1) (debug t))
|
2006-03-12 04:12:31 +00:00
|
|
|
|
(let ((old-frame (make-symbol "old-frame"))
|
|
|
|
|
(old-buffer (make-symbol "old-buffer")))
|
|
|
|
|
`(let ((,old-frame (selected-frame))
|
|
|
|
|
(,old-buffer (current-buffer)))
|
|
|
|
|
(unwind-protect
|
2008-11-02 11:02:58 +00:00
|
|
|
|
(progn (select-frame ,frame 'norecord)
|
2006-03-12 04:12:31 +00:00
|
|
|
|
,@body)
|
2008-11-02 11:02:58 +00:00
|
|
|
|
(when (frame-live-p ,old-frame)
|
|
|
|
|
(select-frame ,old-frame 'norecord))
|
|
|
|
|
(when (buffer-live-p ,old-buffer)
|
|
|
|
|
(set-buffer ,old-buffer))))))
|
2004-05-23 02:26:21 +00:00
|
|
|
|
|
2011-02-19 05:10:33 +00:00
|
|
|
|
(defmacro save-window-excursion (&rest body)
|
2012-03-11 16:10:07 +00:00
|
|
|
|
"Execute BODY, then restore previous window configuration.
|
2012-03-11 16:16:50 +00:00
|
|
|
|
This macro saves the window configuration on the selected frame,
|
|
|
|
|
executes BODY, then calls `set-window-configuration' to restore
|
|
|
|
|
the saved window configuration. The return value is the last
|
|
|
|
|
form in BODY. The window configuration is also restored if BODY
|
|
|
|
|
exits nonlocally.
|
2011-02-19 05:10:33 +00:00
|
|
|
|
|
|
|
|
|
BEWARE: Most uses of this macro introduce bugs.
|
|
|
|
|
E.g. it should not be used to try and prevent some code from opening
|
|
|
|
|
a new window, since that window may sometimes appear in another frame,
|
|
|
|
|
in which case `save-window-excursion' cannot help."
|
|
|
|
|
(declare (indent 0) (debug t))
|
|
|
|
|
(let ((c (make-symbol "wconfig")))
|
|
|
|
|
`(let ((,c (current-window-configuration)))
|
|
|
|
|
(unwind-protect (progn ,@body)
|
|
|
|
|
(set-window-configuration ,c)))))
|
|
|
|
|
|
2012-10-23 01:18:47 +00:00
|
|
|
|
(defun internal-temp-output-buffer-show (buffer)
|
2012-09-22 16:28:46 +00:00
|
|
|
|
"Internal function for `with-output-to-temp-buffer'."
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
|
|
|
|
|
(if temp-buffer-show-function
|
|
|
|
|
(funcall temp-buffer-show-function buffer)
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(let* ((window
|
|
|
|
|
(let ((window-combination-limit
|
|
|
|
|
;; When `window-combination-limit' equals
|
|
|
|
|
;; `temp-buffer' or `temp-buffer-resize' and
|
|
|
|
|
;; `temp-buffer-resize-mode' is enabled in this
|
|
|
|
|
;; buffer bind it to t so resizing steals space
|
|
|
|
|
;; preferably from the window that was split.
|
|
|
|
|
(if (or (eq window-combination-limit 'temp-buffer)
|
|
|
|
|
(and (eq window-combination-limit
|
|
|
|
|
'temp-buffer-resize)
|
|
|
|
|
temp-buffer-resize-mode))
|
|
|
|
|
t
|
|
|
|
|
window-combination-limit)))
|
|
|
|
|
(display-buffer buffer)))
|
|
|
|
|
(frame (and window (window-frame window))))
|
|
|
|
|
(when window
|
|
|
|
|
(unless (eq frame (selected-frame))
|
|
|
|
|
(make-frame-visible frame))
|
|
|
|
|
(setq minibuffer-scroll-window window)
|
|
|
|
|
(set-window-hscroll window 0)
|
|
|
|
|
;; Don't try this with NOFORCE non-nil!
|
|
|
|
|
(set-window-start window (point-min) t)
|
2012-10-05 05:57:24 +00:00
|
|
|
|
;; This should not be necessary.
|
2012-09-22 16:28:46 +00:00
|
|
|
|
(set-window-point window (point-min))
|
|
|
|
|
;; Run `temp-buffer-show-hook', with the chosen window selected.
|
|
|
|
|
(with-selected-window window
|
|
|
|
|
(run-hooks 'temp-buffer-show-hook))))))
|
|
|
|
|
;; Return nil.
|
|
|
|
|
nil)
|
|
|
|
|
|
2012-11-17 02:03:58 +00:00
|
|
|
|
;; Doc is very similar to with-temp-buffer-window.
|
2011-02-21 20:12:44 +00:00
|
|
|
|
(defmacro with-output-to-temp-buffer (bufname &rest body)
|
|
|
|
|
"Bind `standard-output' to buffer BUFNAME, eval BODY, then show that buffer.
|
|
|
|
|
|
|
|
|
|
This construct makes buffer BUFNAME empty before running BODY.
|
|
|
|
|
It does not make the buffer current for BODY.
|
|
|
|
|
Instead it binds `standard-output' to that buffer, so that output
|
|
|
|
|
generated with `prin1' and similar functions in BODY goes into
|
|
|
|
|
the buffer.
|
|
|
|
|
|
2011-09-28 00:59:28 +00:00
|
|
|
|
At the end of BODY, this marks buffer BUFNAME unmodified and displays
|
2011-02-21 20:12:44 +00:00
|
|
|
|
it in a window, but does not select it. The normal way to do this is
|
|
|
|
|
by calling `display-buffer', then running `temp-buffer-show-hook'.
|
|
|
|
|
However, if `temp-buffer-show-function' is non-nil, it calls that
|
|
|
|
|
function instead (and does not run `temp-buffer-show-hook'). The
|
|
|
|
|
function gets one argument, the buffer to display.
|
|
|
|
|
|
|
|
|
|
The return value of `with-output-to-temp-buffer' is the value of the
|
|
|
|
|
last form in BODY. If BODY does not finish normally, the buffer
|
|
|
|
|
BUFNAME is not displayed.
|
|
|
|
|
|
|
|
|
|
This runs the hook `temp-buffer-setup-hook' before BODY,
|
|
|
|
|
with the buffer BUFNAME temporarily current. It runs the hook
|
|
|
|
|
`temp-buffer-show-hook' after displaying buffer BUFNAME, with that
|
|
|
|
|
buffer temporarily current, and the window that was used to display it
|
|
|
|
|
temporarily selected. But it doesn't run `temp-buffer-show-hook'
|
2012-11-17 02:03:58 +00:00
|
|
|
|
if it uses `temp-buffer-show-function'.
|
|
|
|
|
|
|
|
|
|
See the related form `with-temp-buffer-window'."
|
2011-06-01 14:19:45 +00:00
|
|
|
|
(declare (debug t))
|
2011-02-21 20:12:44 +00:00
|
|
|
|
(let ((old-dir (make-symbol "old-dir"))
|
|
|
|
|
(buf (make-symbol "buf")))
|
2011-03-30 03:27:56 +00:00
|
|
|
|
`(let* ((,old-dir default-directory)
|
|
|
|
|
(,buf
|
|
|
|
|
(with-current-buffer (get-buffer-create ,bufname)
|
|
|
|
|
(prog1 (current-buffer)
|
|
|
|
|
(kill-all-local-variables)
|
|
|
|
|
;; FIXME: delete_all_overlays
|
|
|
|
|
(setq default-directory ,old-dir)
|
|
|
|
|
(setq buffer-read-only nil)
|
|
|
|
|
(setq buffer-file-name nil)
|
|
|
|
|
(setq buffer-undo-list t)
|
|
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
|
(inhibit-modification-hooks t))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(run-hooks 'temp-buffer-setup-hook)))))
|
|
|
|
|
(standard-output ,buf))
|
|
|
|
|
(prog1 (progn ,@body)
|
2012-10-23 01:18:47 +00:00
|
|
|
|
(internal-temp-output-buffer-show ,buf)))))
|
2011-02-21 20:12:44 +00:00
|
|
|
|
|
1998-11-19 09:43:40 +00:00
|
|
|
|
(defmacro with-temp-file (file &rest body)
|
|
|
|
|
"Create a new buffer, evaluate BODY there, and write the buffer to FILE.
|
|
|
|
|
The value returned is the value of the last form in BODY.
|
1996-10-03 02:13:52 +00:00
|
|
|
|
See also `with-temp-buffer'."
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 13:03:05 +00:00
|
|
|
|
(declare (indent 1) (debug t))
|
1996-09-28 04:16:00 +00:00
|
|
|
|
(let ((temp-file (make-symbol "temp-file"))
|
1996-10-03 02:13:52 +00:00
|
|
|
|
(temp-buffer (make-symbol "temp-buffer")))
|
|
|
|
|
`(let ((,temp-file ,file)
|
|
|
|
|
(,temp-buffer
|
|
|
|
|
(get-buffer-create (generate-new-buffer-name " *temp file*"))))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(prog1
|
|
|
|
|
(with-current-buffer ,temp-buffer
|
1998-11-19 09:43:40 +00:00
|
|
|
|
,@body)
|
1996-10-03 02:13:52 +00:00
|
|
|
|
(with-current-buffer ,temp-buffer
|
2008-05-28 17:35:34 +00:00
|
|
|
|
(write-region nil nil ,temp-file nil 0)))
|
1996-10-03 02:13:52 +00:00
|
|
|
|
(and (buffer-name ,temp-buffer)
|
|
|
|
|
(kill-buffer ,temp-buffer))))))
|
|
|
|
|
|
1998-11-19 09:43:40 +00:00
|
|
|
|
(defmacro with-temp-message (message &rest body)
|
1999-01-06 15:23:46 +00:00
|
|
|
|
"Display MESSAGE temporarily if non-nil while BODY is evaluated.
|
1998-11-19 09:43:40 +00:00
|
|
|
|
The original message is restored to the echo area after BODY has finished.
|
|
|
|
|
The value returned is the value of the last form in BODY.
|
1999-01-06 15:23:46 +00:00
|
|
|
|
MESSAGE is written to the message log buffer if `message-log-max' is non-nil.
|
|
|
|
|
If MESSAGE is nil, the echo area and message log buffer are unchanged.
|
|
|
|
|
Use a MESSAGE of \"\" to temporarily clear the echo area."
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 13:03:05 +00:00
|
|
|
|
(declare (debug t) (indent 1))
|
1999-01-06 10:05:50 +00:00
|
|
|
|
(let ((current-message (make-symbol "current-message"))
|
|
|
|
|
(temp-message (make-symbol "with-temp-message")))
|
|
|
|
|
`(let ((,temp-message ,message)
|
|
|
|
|
(,current-message))
|
1998-11-19 09:43:40 +00:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
1999-01-06 10:05:50 +00:00
|
|
|
|
(when ,temp-message
|
|
|
|
|
(setq ,current-message (current-message))
|
1999-05-07 09:42:50 +00:00
|
|
|
|
(message "%s" ,temp-message))
|
1998-11-19 09:43:40 +00:00
|
|
|
|
,@body)
|
2001-12-16 17:41:30 +00:00
|
|
|
|
(and ,temp-message
|
|
|
|
|
(if ,current-message
|
|
|
|
|
(message "%s" ,current-message)
|
|
|
|
|
(message nil)))))))
|
1998-11-19 09:43:40 +00:00
|
|
|
|
|
|
|
|
|
(defmacro with-temp-buffer (&rest body)
|
|
|
|
|
"Create a temporary buffer, and evaluate BODY there like `progn'.
|
1996-10-03 02:13:52 +00:00
|
|
|
|
See also `with-temp-file' and `with-output-to-string'."
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 0) (debug t))
|
1996-10-03 02:13:52 +00:00
|
|
|
|
(let ((temp-buffer (make-symbol "temp-buffer")))
|
2004-10-13 17:05:55 +00:00
|
|
|
|
`(let ((,temp-buffer (generate-new-buffer " *temp*")))
|
2008-03-29 22:50:11 +00:00
|
|
|
|
;; FIXME: kill-buffer can change current-buffer in some odd cases.
|
|
|
|
|
(with-current-buffer ,temp-buffer
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn ,@body)
|
|
|
|
|
(and (buffer-name ,temp-buffer)
|
|
|
|
|
(kill-buffer ,temp-buffer)))))))
|
1996-10-03 02:13:52 +00:00
|
|
|
|
|
2009-09-08 19:42:21 +00:00
|
|
|
|
(defmacro with-silent-modifications (&rest body)
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 13:03:05 +00:00
|
|
|
|
"Execute BODY, pretending it does not modify the buffer.
|
2009-09-08 19:42:21 +00:00
|
|
|
|
If BODY performs real modifications to the buffer's text, other
|
|
|
|
|
than cosmetic ones, undo data may become corrupted.
|
2011-07-13 23:40:11 +00:00
|
|
|
|
|
|
|
|
|
This macro will run BODY normally, but doesn't count its buffer
|
|
|
|
|
modifications as being buffer modifications. This affects things
|
2013-06-11 16:51:12 +00:00
|
|
|
|
like `buffer-modified-p', checking whether the file is locked by
|
2011-07-13 23:40:11 +00:00
|
|
|
|
someone else, running buffer modification hooks, and other things
|
|
|
|
|
of that nature.
|
|
|
|
|
|
|
|
|
|
Typically used around modifications of text-properties which do
|
|
|
|
|
not really affect the buffer's content."
|
2009-09-08 19:42:21 +00:00
|
|
|
|
(declare (debug t) (indent 0))
|
|
|
|
|
(let ((modified (make-symbol "modified")))
|
|
|
|
|
`(let* ((,modified (buffer-modified-p))
|
|
|
|
|
(buffer-undo-list t)
|
|
|
|
|
(inhibit-read-only t)
|
|
|
|
|
(inhibit-modification-hooks t)
|
|
|
|
|
deactivate-mark
|
|
|
|
|
;; Avoid setting and removing file locks and checking
|
|
|
|
|
;; buffer's uptodate-ness w.r.t the underlying file.
|
|
|
|
|
buffer-file-name
|
|
|
|
|
buffer-file-truename)
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
,@body)
|
|
|
|
|
(unless ,modified
|
|
|
|
|
(restore-buffer-modified-p nil))))))
|
|
|
|
|
|
1996-09-24 20:03:15 +00:00
|
|
|
|
(defmacro with-output-to-string (&rest body)
|
|
|
|
|
"Execute BODY, return the text it sent to `standard-output', as a string."
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 0) (debug t))
|
1996-10-03 02:13:52 +00:00
|
|
|
|
`(let ((standard-output
|
|
|
|
|
(get-buffer-create (generate-new-buffer-name " *string-output*"))))
|
2008-09-23 17:26:40 +00:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(let ((standard-output standard-output))
|
|
|
|
|
,@body)
|
|
|
|
|
(with-current-buffer standard-output
|
|
|
|
|
(buffer-string)))
|
|
|
|
|
(kill-buffer standard-output))))
|
1996-11-09 21:46:35 +00:00
|
|
|
|
|
2001-11-08 00:57:57 +00:00
|
|
|
|
(defmacro with-local-quit (&rest body)
|
2004-07-31 03:42:27 +00:00
|
|
|
|
"Execute BODY, allowing quits to terminate BODY but not escape further.
|
2004-10-17 06:59:15 +00:00
|
|
|
|
When a quit terminates BODY, `with-local-quit' returns nil but
|
2006-05-25 00:20:40 +00:00
|
|
|
|
requests another quit. That quit will be processed as soon as quitting
|
|
|
|
|
is allowed once again. (Immediately, if `inhibit-quit' is nil.)"
|
2002-11-20 14:31:52 +00:00
|
|
|
|
(declare (debug t) (indent 0))
|
2001-11-08 00:57:57 +00:00
|
|
|
|
`(condition-case nil
|
|
|
|
|
(let ((inhibit-quit nil))
|
|
|
|
|
,@body)
|
2006-05-25 00:19:02 +00:00
|
|
|
|
(quit (setq quit-flag t)
|
|
|
|
|
;; This call is to give a chance to handle quit-flag
|
|
|
|
|
;; in case inhibit-quit is nil.
|
|
|
|
|
;; Without this, it will not be handled until the next function
|
|
|
|
|
;; call, and that might allow it to exit thru a condition-case
|
|
|
|
|
;; that intends to handle the quit signal next time.
|
|
|
|
|
(eval '(ignore nil)))))
|
2001-11-08 00:57:57 +00:00
|
|
|
|
|
2004-12-13 19:26:42 +00:00
|
|
|
|
(defmacro while-no-input (&rest body)
|
|
|
|
|
"Execute BODY only as long as there's no pending input.
|
|
|
|
|
If input arrives, that ends the execution of BODY,
|
2005-08-09 02:51:22 +00:00
|
|
|
|
and `while-no-input' returns t. Quitting makes it return nil.
|
|
|
|
|
If BODY finishes, `while-no-input' returns whatever value BODY produced."
|
2004-12-13 19:26:42 +00:00
|
|
|
|
(declare (debug t) (indent 0))
|
|
|
|
|
(let ((catch-sym (make-symbol "input")))
|
|
|
|
|
`(with-local-quit
|
|
|
|
|
(catch ',catch-sym
|
|
|
|
|
(let ((throw-on-input ',catch-sym))
|
2006-09-11 22:21:55 +00:00
|
|
|
|
(or (input-pending-p)
|
2008-03-08 16:06:25 +00:00
|
|
|
|
(progn ,@body)))))))
|
2004-12-13 19:26:42 +00:00
|
|
|
|
|
2012-02-10 15:59:29 +00:00
|
|
|
|
(defmacro condition-case-unless-debug (var bodyform &rest handlers)
|
2013-01-13 01:23:48 +00:00
|
|
|
|
"Like `condition-case' except that it does not prevent debugging.
|
|
|
|
|
More specifically if `debug-on-error' is set then the debugger will be invoked
|
|
|
|
|
even if this catches the signal."
|
2007-07-10 19:54:43 +00:00
|
|
|
|
(declare (debug condition-case) (indent 2))
|
2013-01-13 01:23:48 +00:00
|
|
|
|
`(condition-case ,var
|
|
|
|
|
,bodyform
|
|
|
|
|
,@(mapcar (lambda (handler)
|
|
|
|
|
`((debug ,@(if (listp (car handler)) (car handler)
|
|
|
|
|
(list (car handler))))
|
|
|
|
|
,@(cdr handler)))
|
|
|
|
|
handlers)))
|
2007-07-10 19:54:43 +00:00
|
|
|
|
|
2012-02-10 15:59:29 +00:00
|
|
|
|
(define-obsolete-function-alias 'condition-case-no-debug
|
|
|
|
|
'condition-case-unless-debug "24.1")
|
|
|
|
|
|
2013-09-10 15:30:10 +00:00
|
|
|
|
(defmacro with-demoted-errors (format &rest body)
|
2007-07-10 19:54:43 +00:00
|
|
|
|
"Run BODY and demote any errors to simple messages.
|
2014-01-24 04:11:48 +00:00
|
|
|
|
FORMAT is a string passed to `message' to format any error message.
|
|
|
|
|
It should contain a single %-sequence; e.g., \"Error: %S\".
|
|
|
|
|
|
2007-07-10 19:54:43 +00:00
|
|
|
|
If `debug-on-error' is non-nil, run BODY without catching its errors.
|
|
|
|
|
This is to be used around code which is not expected to signal an error
|
2013-09-10 15:30:10 +00:00
|
|
|
|
but which should be robust in the unexpected case that an error is signaled.
|
2014-01-24 04:11:48 +00:00
|
|
|
|
|
2013-09-10 15:30:10 +00:00
|
|
|
|
For backward compatibility, if FORMAT is not a constant string, it
|
|
|
|
|
is assumed to be part of BODY, in which case the message format
|
|
|
|
|
used is \"Error: %S\"."
|
|
|
|
|
(declare (debug t) (indent 1))
|
|
|
|
|
(let ((err (make-symbol "err"))
|
|
|
|
|
(format (if (and (stringp format) body) format
|
|
|
|
|
(prog1 "Error: %S"
|
|
|
|
|
(if format (push format body))))))
|
2012-02-10 15:59:29 +00:00
|
|
|
|
`(condition-case-unless-debug ,err
|
2013-09-10 15:30:10 +00:00
|
|
|
|
,(macroexp-progn body)
|
|
|
|
|
(error (message ,format ,err) nil))))
|
2007-07-10 19:54:43 +00:00
|
|
|
|
|
1996-11-09 21:46:35 +00:00
|
|
|
|
(defmacro combine-after-change-calls (&rest body)
|
|
|
|
|
"Execute BODY, but don't call the after-change functions till the end.
|
|
|
|
|
If BODY makes changes in the buffer, they are recorded
|
|
|
|
|
and the functions on `after-change-functions' are called several times
|
|
|
|
|
when BODY is finished.
|
1997-03-11 23:55:24 +00:00
|
|
|
|
The return value is the value of the last form in BODY.
|
1996-11-09 21:46:35 +00:00
|
|
|
|
|
|
|
|
|
If `before-change-functions' is non-nil, then calls to the after-change
|
|
|
|
|
functions can't be deferred, so in that case this macro has no effect.
|
|
|
|
|
|
|
|
|
|
Do not alter `after-change-functions' or `before-change-functions'
|
|
|
|
|
in BODY."
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 0) (debug t))
|
1996-11-09 21:46:35 +00:00
|
|
|
|
`(unwind-protect
|
|
|
|
|
(let ((combine-after-change-calls t))
|
|
|
|
|
. ,body)
|
|
|
|
|
(combine-after-change-execute)))
|
2007-04-04 15:34:43 +00:00
|
|
|
|
|
|
|
|
|
(defmacro with-case-table (table &rest body)
|
|
|
|
|
"Execute the forms in BODY with TABLE as the current case table.
|
|
|
|
|
The value returned is the value of the last form in BODY."
|
|
|
|
|
(declare (indent 1) (debug t))
|
2007-04-06 12:15:04 +00:00
|
|
|
|
(let ((old-case-table (make-symbol "table"))
|
|
|
|
|
(old-buffer (make-symbol "buffer")))
|
|
|
|
|
`(let ((,old-case-table (current-case-table))
|
|
|
|
|
(,old-buffer (current-buffer)))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn (set-case-table ,table)
|
|
|
|
|
,@body)
|
|
|
|
|
(with-current-buffer ,old-buffer
|
|
|
|
|
(set-case-table ,old-case-table))))))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
;;; Matching and match data.
|
2002-04-19 00:06:54 +00:00
|
|
|
|
|
1996-08-28 22:44:18 +00:00
|
|
|
|
(defvar save-match-data-internal)
|
|
|
|
|
|
|
|
|
|
;; We use save-match-data-internal as the local variable because
|
|
|
|
|
;; that works ok in practice (people should not use that variable elsewhere).
|
|
|
|
|
;; We used to use an uninterned symbol; the compiler handles that properly
|
|
|
|
|
;; now, but it generates slower code.
|
1993-04-10 06:21:55 +00:00
|
|
|
|
(defmacro save-match-data (&rest body)
|
2002-02-25 17:44:03 +00:00
|
|
|
|
"Execute the BODY forms, restoring the global value of the match data.
|
|
|
|
|
The value returned is the value of the last form in BODY."
|
Fix bootstrapping problems.
Use the system locale to specify Emacs locale defaults.
* international/mule-cmds.el (global-map):
Do not use backquote, because that makes a bootstrapping
problem if you need to recompile all Lisp files using interpreted code.
* international/mule.el (charset-id, charset-bytes,
charset-dimension, charset-chars, charset-width,
charset-direction, charset-iso-final-char,
charset-iso-graphic-plane, charset-reverse-charset,
charset-short-name, charset-long-name, charset-description,
charset-plist): Likewise.
* subr.el (save-match-data): Likewise.
* international/mule-cmds.el
(set-display-table-and-terminal-coding-system): New function,
containing code migrated out of set-language-environment.
(set-language-environment, set-locale-environment): Use it.
(locale-translation-file-name): Moved here from startup.el.
(locale-language-names, locale-preferred-coding-systems):
New vars.
(locale-name-match, set-locale-environment): New functions.
* language/japan-util.el (setup-japanese-environment-internal):
Prefer japanese-iso-8bit if the system-type is usg-unix-v.
* startup.el (iso-8859-n-locale-regexp): Remove.
(locale-translation-file-name): Move to mule-cmds.el.
(command-line): Move locale-stuff into set-locale-environment.
1999-10-19 07:18:58 +00:00
|
|
|
|
;; It is better not to use backquote here,
|
|
|
|
|
;; because that makes a bootstrapping problem
|
|
|
|
|
;; if you need to recompile all the Lisp files using interpreted code.
|
2003-05-17 22:00:40 +00:00
|
|
|
|
(declare (indent 0) (debug t))
|
Fix bootstrapping problems.
Use the system locale to specify Emacs locale defaults.
* international/mule-cmds.el (global-map):
Do not use backquote, because that makes a bootstrapping
problem if you need to recompile all Lisp files using interpreted code.
* international/mule.el (charset-id, charset-bytes,
charset-dimension, charset-chars, charset-width,
charset-direction, charset-iso-final-char,
charset-iso-graphic-plane, charset-reverse-charset,
charset-short-name, charset-long-name, charset-description,
charset-plist): Likewise.
* subr.el (save-match-data): Likewise.
* international/mule-cmds.el
(set-display-table-and-terminal-coding-system): New function,
containing code migrated out of set-language-environment.
(set-language-environment, set-locale-environment): Use it.
(locale-translation-file-name): Moved here from startup.el.
(locale-language-names, locale-preferred-coding-systems):
New vars.
(locale-name-match, set-locale-environment): New functions.
* language/japan-util.el (setup-japanese-environment-internal):
Prefer japanese-iso-8bit if the system-type is usg-unix-v.
* startup.el (iso-8859-n-locale-regexp): Remove.
(locale-translation-file-name): Move to mule-cmds.el.
(command-line): Move locale-stuff into set-locale-environment.
1999-10-19 07:18:58 +00:00
|
|
|
|
(list 'let
|
|
|
|
|
'((save-match-data-internal (match-data)))
|
|
|
|
|
(list 'unwind-protect
|
|
|
|
|
(cons 'progn body)
|
2005-06-22 23:18:45 +00:00
|
|
|
|
;; It is safe to free (evaporate) markers immediately here,
|
|
|
|
|
;; as Lisp programs should not copy from save-match-data-internal.
|
2005-06-08 22:37:23 +00:00
|
|
|
|
'(set-match-data save-match-data-internal 'evaporate))))
|
1995-03-23 08:43:08 +00:00
|
|
|
|
|
1995-03-24 09:01:09 +00:00
|
|
|
|
(defun match-string (num &optional string)
|
1995-03-23 08:43:08 +00:00
|
|
|
|
"Return string of text matched by last search.
|
|
|
|
|
NUM specifies which parenthesized expression in the last regexp.
|
|
|
|
|
Value is nil if NUMth pair didn't match, or there were less than NUM pairs.
|
|
|
|
|
Zero means the entire text matched by the whole regexp or whole string.
|
2011-09-11 02:10:15 +00:00
|
|
|
|
STRING should be given if the last search was by `string-match' on STRING.
|
|
|
|
|
If STRING is nil, the current buffer should be the same buffer
|
|
|
|
|
the search/match was performed in."
|
1995-03-24 09:01:09 +00:00
|
|
|
|
(if (match-beginning num)
|
|
|
|
|
(if string
|
|
|
|
|
(substring string (match-beginning num) (match-end num))
|
|
|
|
|
(buffer-substring (match-beginning num) (match-end num)))))
|
1995-01-27 07:06:27 +00:00
|
|
|
|
|
1997-12-21 02:08:37 +00:00
|
|
|
|
(defun match-string-no-properties (num &optional string)
|
|
|
|
|
"Return string of text matched by last search, without text properties.
|
|
|
|
|
NUM specifies which parenthesized expression in the last regexp.
|
|
|
|
|
Value is nil if NUMth pair didn't match, or there were less than NUM pairs.
|
|
|
|
|
Zero means the entire text matched by the whole regexp or whole string.
|
2011-09-11 02:10:15 +00:00
|
|
|
|
STRING should be given if the last search was by `string-match' on STRING.
|
|
|
|
|
If STRING is nil, the current buffer should be the same buffer
|
|
|
|
|
the search/match was performed in."
|
1997-12-21 02:08:37 +00:00
|
|
|
|
(if (match-beginning num)
|
|
|
|
|
(if string
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(substring-no-properties string (match-beginning num)
|
|
|
|
|
(match-end num))
|
1997-12-21 02:08:37 +00:00
|
|
|
|
(buffer-substring-no-properties (match-beginning num)
|
|
|
|
|
(match-end num)))))
|
|
|
|
|
|
2007-11-10 21:48:16 +00:00
|
|
|
|
|
|
|
|
|
(defun match-substitute-replacement (replacement
|
|
|
|
|
&optional fixedcase literal string subexp)
|
|
|
|
|
"Return REPLACEMENT as it will be inserted by `replace-match'.
|
|
|
|
|
In other words, all back-references in the form `\\&' and `\\N'
|
|
|
|
|
are substituted with actual strings matched by the last search.
|
|
|
|
|
Optional FIXEDCASE, LITERAL, STRING and SUBEXP have the same
|
|
|
|
|
meaning as for `replace-match'."
|
|
|
|
|
(let ((match (match-string 0 string)))
|
|
|
|
|
(save-match-data
|
|
|
|
|
(set-match-data (mapcar (lambda (x)
|
|
|
|
|
(if (numberp x)
|
|
|
|
|
(- x (match-beginning 0))
|
|
|
|
|
x))
|
|
|
|
|
(match-data t)))
|
|
|
|
|
(replace-match replacement fixedcase literal match subexp))))
|
|
|
|
|
|
|
|
|
|
|
2005-05-29 08:34:46 +00:00
|
|
|
|
(defun looking-back (regexp &optional limit greedy)
|
2003-06-18 21:49:55 +00:00
|
|
|
|
"Return non-nil if text before point matches regular expression REGEXP.
|
2004-10-16 15:29:46 +00:00
|
|
|
|
Like `looking-at' except matches before point, and is slower.
|
2006-07-24 17:01:08 +00:00
|
|
|
|
LIMIT if non-nil speeds up the search by specifying a minimum
|
|
|
|
|
starting position, to avoid checking matches that would start
|
|
|
|
|
before LIMIT.
|
2005-05-29 08:34:46 +00:00
|
|
|
|
|
2008-11-03 19:22:28 +00:00
|
|
|
|
If GREEDY is non-nil, extend the match backwards as far as
|
|
|
|
|
possible, stopping when a single additional previous character
|
|
|
|
|
cannot be part of a match for REGEXP. When the match is
|
2008-11-04 07:35:57 +00:00
|
|
|
|
extended, its starting position is allowed to occur before
|
2013-09-29 06:16:45 +00:00
|
|
|
|
LIMIT.
|
|
|
|
|
|
|
|
|
|
As a general recommendation, try to avoid using `looking-back'
|
|
|
|
|
wherever possible, since it is slow."
|
2005-05-29 08:34:46 +00:00
|
|
|
|
(let ((start (point))
|
|
|
|
|
(pos
|
|
|
|
|
(save-excursion
|
|
|
|
|
(and (re-search-backward (concat "\\(?:" regexp "\\)\\=") limit t)
|
|
|
|
|
(point)))))
|
|
|
|
|
(if (and greedy pos)
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region (point-min) start)
|
|
|
|
|
(while (and (> pos (point-min))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char pos)
|
|
|
|
|
(backward-char 1)
|
|
|
|
|
(looking-at (concat "\\(?:" regexp "\\)\\'"))))
|
|
|
|
|
(setq pos (1- pos)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char pos)
|
|
|
|
|
(looking-at (concat "\\(?:" regexp "\\)\\'")))))
|
|
|
|
|
(not (null pos))))
|
|
|
|
|
|
2007-07-10 03:54:30 +00:00
|
|
|
|
(defsubst looking-at-p (regexp)
|
|
|
|
|
"\
|
|
|
|
|
Same as `looking-at' except this function does not change the match data."
|
|
|
|
|
(let ((inhibit-changing-match-data t))
|
|
|
|
|
(looking-at regexp)))
|
|
|
|
|
|
|
|
|
|
(defsubst string-match-p (regexp string &optional start)
|
|
|
|
|
"\
|
|
|
|
|
Same as `string-match' except this function does not change the match data."
|
|
|
|
|
(let ((inhibit-changing-match-data t))
|
|
|
|
|
(string-match regexp string start)))
|
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun subregexp-context-p (regexp pos &optional start)
|
|
|
|
|
"Return non-nil if POS is in a normal subregexp context in REGEXP.
|
|
|
|
|
A subregexp context is one where a sub-regexp can appear.
|
|
|
|
|
A non-subregexp context is for example within brackets, or within a
|
|
|
|
|
repetition bounds operator `\\=\\{...\\}', or right after a `\\'.
|
|
|
|
|
If START is non-nil, it should be a position in REGEXP, smaller
|
|
|
|
|
than POS, and known to be in a subregexp context."
|
|
|
|
|
;; Here's one possible implementation, with the great benefit that it
|
|
|
|
|
;; reuses the regexp-matcher's own parser, so it understands all the
|
|
|
|
|
;; details of the syntax. A disadvantage is that it needs to match the
|
|
|
|
|
;; error string.
|
|
|
|
|
(condition-case err
|
|
|
|
|
(progn
|
|
|
|
|
(string-match (substring regexp (or start 0) pos) "")
|
|
|
|
|
t)
|
|
|
|
|
(invalid-regexp
|
|
|
|
|
(not (member (cadr err) '("Unmatched [ or [^"
|
|
|
|
|
"Unmatched \\{"
|
|
|
|
|
"Trailing backslash")))))
|
|
|
|
|
;; An alternative implementation:
|
|
|
|
|
;; (defconst re-context-re
|
|
|
|
|
;; (let* ((harmless-ch "[^\\[]")
|
|
|
|
|
;; (harmless-esc "\\\\[^{]")
|
|
|
|
|
;; (class-harmless-ch "[^][]")
|
|
|
|
|
;; (class-lb-harmless "[^]:]")
|
|
|
|
|
;; (class-lb-colon-maybe-charclass ":\\([a-z]+:]\\)?")
|
|
|
|
|
;; (class-lb (concat "\\[\\(" class-lb-harmless
|
|
|
|
|
;; "\\|" class-lb-colon-maybe-charclass "\\)"))
|
|
|
|
|
;; (class
|
|
|
|
|
;; (concat "\\[^?]?"
|
|
|
|
|
;; "\\(" class-harmless-ch
|
|
|
|
|
;; "\\|" class-lb "\\)*"
|
|
|
|
|
;; "\\[?]")) ; special handling for bare [ at end of re
|
|
|
|
|
;; (braces "\\\\{[0-9,]+\\\\}"))
|
|
|
|
|
;; (concat "\\`\\(" harmless-ch "\\|" harmless-esc
|
|
|
|
|
;; "\\|" class "\\|" braces "\\)*\\'"))
|
|
|
|
|
;; "Matches any prefix that corresponds to a normal subregexp context.")
|
|
|
|
|
;; (string-match re-context-re (substring regexp (or start 0) pos))
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
;;;; split-string
|
2003-05-30 23:11:35 +00:00
|
|
|
|
|
2003-05-22 20:59:57 +00:00
|
|
|
|
(defconst split-string-default-separators "[ \f\t\n\r\v]+"
|
|
|
|
|
"The default value of separators for `split-string'.
|
|
|
|
|
|
|
|
|
|
A regexp matching strings of whitespace. May be locale-dependent
|
|
|
|
|
\(as yet unimplemented). Should not match non-breaking spaces.
|
|
|
|
|
|
|
|
|
|
Warning: binding this to a different value and using it as default is
|
|
|
|
|
likely to have undesired semantics.")
|
|
|
|
|
|
|
|
|
|
;; The specification says that if both SEPARATORS and OMIT-NULLS are
|
|
|
|
|
;; defaulted, OMIT-NULLS should be treated as t. Simplifying the logical
|
|
|
|
|
;; expression leads to the equivalent implementation that if SEPARATORS
|
|
|
|
|
;; is defaulted, OMIT-NULLS is treated as t.
|
2013-07-19 12:18:16 +00:00
|
|
|
|
(defun split-string (string &optional separators omit-nulls trim)
|
2004-09-08 12:24:29 +00:00
|
|
|
|
"Split STRING into substrings bounded by matches for SEPARATORS.
|
2003-05-22 20:59:57 +00:00
|
|
|
|
|
|
|
|
|
The beginning and end of STRING, and each match for SEPARATORS, are
|
|
|
|
|
splitting points. The substrings matching SEPARATORS are removed, and
|
|
|
|
|
the substrings between the splitting points are collected as a list,
|
1996-09-24 21:19:03 +00:00
|
|
|
|
which is returned.
|
1997-12-21 01:35:50 +00:00
|
|
|
|
|
2003-05-22 20:59:57 +00:00
|
|
|
|
If SEPARATORS is non-nil, it should be a regular expression matching text
|
|
|
|
|
which separates, but is not part of, the substrings. If nil it defaults to
|
|
|
|
|
`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and
|
|
|
|
|
OMIT-NULLS is forced to t.
|
|
|
|
|
|
2013-06-11 16:51:12 +00:00
|
|
|
|
If OMIT-NULLS is t, zero-length substrings are omitted from the list (so
|
2003-05-22 20:59:57 +00:00
|
|
|
|
that for the default value of SEPARATORS leading and trailing whitespace
|
|
|
|
|
are effectively trimmed). If nil, all zero-length substrings are retained,
|
|
|
|
|
which correctly parses CSV format, for example.
|
|
|
|
|
|
2013-07-19 12:18:16 +00:00
|
|
|
|
If TRIM is non-nil, it should be a regular expression to match
|
|
|
|
|
text to trim from the beginning and end of each substring. If trimming
|
|
|
|
|
makes the substring empty, it is treated as null.
|
|
|
|
|
|
|
|
|
|
If you want to trim whitespace from the substrings, the reliably correct
|
|
|
|
|
way is using TRIM. Making SEPARATORS match that whitespace gives incorrect
|
|
|
|
|
results when there is whitespace at the start or end of STRING. If you
|
|
|
|
|
see such calls to `split-string', please fix them.
|
|
|
|
|
|
2003-05-22 20:59:57 +00:00
|
|
|
|
Note that the effect of `(split-string STRING)' is the same as
|
2007-01-06 14:36:34 +00:00
|
|
|
|
`(split-string STRING split-string-default-separators t)'. In the rare
|
2003-05-22 20:59:57 +00:00
|
|
|
|
case that you wish to retain zero-length substrings when splitting on
|
|
|
|
|
whitespace, use `(split-string STRING split-string-default-separators)'.
|
2000-02-22 20:16:31 +00:00
|
|
|
|
|
|
|
|
|
Modifies the match data; use `save-match-data' if necessary."
|
2013-07-19 12:18:16 +00:00
|
|
|
|
(let* ((keep-nulls (not (if separators omit-nulls t)))
|
|
|
|
|
(rexp (or separators split-string-default-separators))
|
|
|
|
|
(start 0)
|
|
|
|
|
this-start this-end
|
|
|
|
|
notfirst
|
|
|
|
|
(list nil)
|
|
|
|
|
(push-one
|
|
|
|
|
;; Push the substring in range THIS-START to THIS-END
|
|
|
|
|
;; onto LIST, trimming it and perhaps discarding it.
|
|
|
|
|
(lambda ()
|
|
|
|
|
(when trim
|
|
|
|
|
;; Discard the trim from start of this substring.
|
|
|
|
|
(let ((tem (string-match trim string this-start)))
|
|
|
|
|
(and (eq tem this-start)
|
|
|
|
|
(setq this-start (match-end 0)))))
|
|
|
|
|
|
|
|
|
|
(when (or keep-nulls (< this-start this-end))
|
|
|
|
|
(let ((this (substring string this-start this-end)))
|
|
|
|
|
|
|
|
|
|
;; Discard the trim from end of this substring.
|
|
|
|
|
(when trim
|
|
|
|
|
(let ((tem (string-match (concat trim "\\'") this 0)))
|
|
|
|
|
(and tem (< tem (length this))
|
|
|
|
|
(setq this (substring this 0 tem)))))
|
|
|
|
|
|
|
|
|
|
;; Trimming could make it empty; check again.
|
|
|
|
|
(when (or keep-nulls (> (length this) 0))
|
|
|
|
|
(push this list)))))))
|
|
|
|
|
|
1997-12-21 01:35:50 +00:00
|
|
|
|
(while (and (string-match rexp string
|
|
|
|
|
(if (and notfirst
|
|
|
|
|
(= start (match-beginning 0))
|
|
|
|
|
(< start (length string)))
|
|
|
|
|
(1+ start) start))
|
2003-05-22 20:59:57 +00:00
|
|
|
|
(< start (length string)))
|
1997-12-21 01:35:50 +00:00
|
|
|
|
(setq notfirst t)
|
2013-07-19 12:18:16 +00:00
|
|
|
|
(setq this-start start this-end (match-beginning 0)
|
|
|
|
|
start (match-end 0))
|
|
|
|
|
|
|
|
|
|
(funcall push-one))
|
|
|
|
|
|
|
|
|
|
;; Handle the substring at the end of STRING.
|
|
|
|
|
(setq this-start start this-end (length string))
|
|
|
|
|
(funcall push-one)
|
|
|
|
|
|
1996-09-24 21:19:03 +00:00
|
|
|
|
(nreverse list)))
|
2007-06-28 01:35:10 +00:00
|
|
|
|
|
2007-08-12 17:59:40 +00:00
|
|
|
|
(defun combine-and-quote-strings (strings &optional separator)
|
2007-06-28 01:35:10 +00:00
|
|
|
|
"Concatenate the STRINGS, adding the SEPARATOR (default \" \").
|
|
|
|
|
This tries to quote the strings to avoid ambiguity such that
|
2007-08-12 17:59:40 +00:00
|
|
|
|
(split-string-and-unquote (combine-and-quote-strings strs)) == strs
|
2007-06-28 01:35:10 +00:00
|
|
|
|
Only some SEPARATORs will work properly."
|
2008-04-07 16:29:54 +00:00
|
|
|
|
(let* ((sep (or separator " "))
|
|
|
|
|
(re (concat "[\\\"]" "\\|" (regexp-quote sep))))
|
2007-06-28 01:35:10 +00:00
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (str)
|
2008-04-07 16:29:54 +00:00
|
|
|
|
(if (string-match re str)
|
2007-06-28 01:35:10 +00:00
|
|
|
|
(concat "\"" (replace-regexp-in-string "[\\\"]" "\\\\\\&" str) "\"")
|
|
|
|
|
str))
|
|
|
|
|
strings sep)))
|
|
|
|
|
|
2007-08-12 17:59:40 +00:00
|
|
|
|
(defun split-string-and-unquote (string &optional separator)
|
2007-06-28 01:35:10 +00:00
|
|
|
|
"Split the STRING into a list of strings.
|
2007-08-12 17:59:40 +00:00
|
|
|
|
It understands Emacs Lisp quoting within STRING, such that
|
|
|
|
|
(split-string-and-unquote (combine-and-quote-strings strs)) == strs
|
2007-06-28 01:35:10 +00:00
|
|
|
|
The SEPARATOR regexp defaults to \"\\s-+\"."
|
|
|
|
|
(let ((sep (or separator "\\s-+"))
|
2008-10-20 17:29:29 +00:00
|
|
|
|
(i (string-match "\"" string)))
|
2007-08-12 17:59:40 +00:00
|
|
|
|
(if (null i)
|
|
|
|
|
(split-string string sep t) ; no quoting: easy
|
2007-06-28 01:35:10 +00:00
|
|
|
|
(append (unless (eq i 0) (split-string (substring string 0 i) sep t))
|
|
|
|
|
(let ((rfs (read-from-string string i)))
|
|
|
|
|
(cons (car rfs)
|
2007-08-12 17:59:40 +00:00
|
|
|
|
(split-string-and-unquote (substring string (cdr rfs))
|
|
|
|
|
sep)))))))
|
2007-06-28 01:35:10 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
;;;; Replacement in strings.
|
1999-01-17 18:55:53 +00:00
|
|
|
|
|
|
|
|
|
(defun subst-char-in-string (fromchar tochar string &optional inplace)
|
|
|
|
|
"Replace FROMCHAR with TOCHAR in STRING each time it occurs.
|
|
|
|
|
Unless optional argument INPLACE is non-nil, return a new string."
|
2000-11-23 22:57:46 +00:00
|
|
|
|
(let ((i (length string))
|
|
|
|
|
(newstr (if inplace string (copy-sequence string))))
|
|
|
|
|
(while (> i 0)
|
|
|
|
|
(setq i (1- i))
|
|
|
|
|
(if (eq (aref newstr i) fromchar)
|
|
|
|
|
(aset newstr i tochar)))
|
|
|
|
|
newstr))
|
2000-02-22 20:16:31 +00:00
|
|
|
|
|
2000-03-14 22:57:28 +00:00
|
|
|
|
(defun replace-regexp-in-string (regexp rep string &optional
|
2007-04-09 23:10:00 +00:00
|
|
|
|
fixedcase literal subexp start)
|
2000-02-22 20:16:31 +00:00
|
|
|
|
"Replace all matches for REGEXP with REP in STRING.
|
|
|
|
|
|
|
|
|
|
Return a new string containing the replacements.
|
|
|
|
|
|
|
|
|
|
Optional arguments FIXEDCASE, LITERAL and SUBEXP are like the
|
|
|
|
|
arguments with the same names of function `replace-match'. If START
|
|
|
|
|
is non-nil, start replacements at that index in STRING.
|
|
|
|
|
|
|
|
|
|
REP is either a string used as the NEWTEXT arg of `replace-match' or a
|
2005-08-20 21:48:51 +00:00
|
|
|
|
function. If it is a function, it is called with the actual text of each
|
|
|
|
|
match, and its value is used as the replacement text. When REP is called,
|
2011-01-11 03:23:04 +00:00
|
|
|
|
the match data are the result of matching REGEXP against a substring
|
2005-08-20 21:48:51 +00:00
|
|
|
|
of STRING.
|
2000-02-22 20:16:31 +00:00
|
|
|
|
|
2000-03-14 22:57:28 +00:00
|
|
|
|
To replace only the first match (if any), make REGEXP match up to \\'
|
|
|
|
|
and replace a sub-expression, e.g.
|
2002-10-29 23:42:00 +00:00
|
|
|
|
(replace-regexp-in-string \"\\\\(foo\\\\).*\\\\'\" \"bar\" \" foo foo\" nil nil 1)
|
2012-04-11 18:13:20 +00:00
|
|
|
|
=> \" bar foo\""
|
2000-02-22 20:16:31 +00:00
|
|
|
|
|
|
|
|
|
;; To avoid excessive consing from multiple matches in long strings,
|
|
|
|
|
;; don't just call `replace-match' continually. Walk down the
|
|
|
|
|
;; string looking for matches of REGEXP and building up a (reversed)
|
|
|
|
|
;; list MATCHES. This comprises segments of STRING which weren't
|
|
|
|
|
;; matched interspersed with replacements for segments that were.
|
2001-10-05 09:26:17 +00:00
|
|
|
|
;; [For a `large' number of replacements it's more efficient to
|
2000-02-22 20:16:31 +00:00
|
|
|
|
;; operate in a temporary buffer; we can't tell from the function's
|
|
|
|
|
;; args whether to choose the buffer-based implementation, though it
|
|
|
|
|
;; might be reasonable to do so for long enough STRING.]
|
|
|
|
|
(let ((l (length string))
|
|
|
|
|
(start (or start 0))
|
|
|
|
|
matches str mb me)
|
|
|
|
|
(save-match-data
|
|
|
|
|
(while (and (< start l) (string-match regexp string start))
|
|
|
|
|
(setq mb (match-beginning 0)
|
|
|
|
|
me (match-end 0))
|
2000-03-08 23:49:09 +00:00
|
|
|
|
;; If we matched the empty string, make sure we advance by one char
|
|
|
|
|
(when (= me mb) (setq me (min l (1+ mb))))
|
|
|
|
|
;; Generate a replacement for the matched substring.
|
|
|
|
|
;; Operate only on the substring to minimize string consing.
|
|
|
|
|
;; Set up match data for the substring for replacement;
|
|
|
|
|
;; presumably this is likely to be faster than munging the
|
|
|
|
|
;; match data directly in Lisp.
|
|
|
|
|
(string-match regexp (setq str (substring string mb me)))
|
|
|
|
|
(setq matches
|
|
|
|
|
(cons (replace-match (if (stringp rep)
|
|
|
|
|
rep
|
|
|
|
|
(funcall rep (match-string 0 str)))
|
|
|
|
|
fixedcase literal str subexp)
|
2007-04-09 23:10:00 +00:00
|
|
|
|
(cons (substring string start mb) ; unmatched prefix
|
2000-03-08 23:49:09 +00:00
|
|
|
|
matches)))
|
|
|
|
|
(setq start me))
|
2000-02-22 20:16:31 +00:00
|
|
|
|
;; Reconstruct a string from the pieces.
|
|
|
|
|
(setq matches (cons (substring string start l) matches)) ; leftover
|
|
|
|
|
(apply #'concat (nreverse matches)))))
|
1996-09-28 04:16:00 +00:00
|
|
|
|
|
2009-11-25 03:59:19 +00:00
|
|
|
|
(defun string-prefix-p (str1 str2 &optional ignore-case)
|
|
|
|
|
"Return non-nil if STR1 is a prefix of STR2.
|
|
|
|
|
If IGNORE-CASE is non-nil, the comparison is done without paying attention
|
|
|
|
|
to case differences."
|
|
|
|
|
(eq t (compare-strings str1 nil nil
|
|
|
|
|
str2 0 (length str1) ignore-case)))
|
2011-08-10 19:03:56 +00:00
|
|
|
|
|
2013-11-24 08:49:44 +00:00
|
|
|
|
(defun string-suffix-p (suffix string &optional ignore-case)
|
|
|
|
|
"Return non-nil if SUFFIX is a suffix of STRING.
|
|
|
|
|
If IGNORE-CASE is non-nil, the comparison is done without paying
|
|
|
|
|
attention to case differences."
|
|
|
|
|
(let ((start-pos (- (length string) (length suffix))))
|
|
|
|
|
(and (>= start-pos 0)
|
|
|
|
|
(eq t (compare-strings suffix nil nil
|
|
|
|
|
string start-pos nil ignore-case)))))
|
|
|
|
|
|
2011-08-18 15:53:29 +00:00
|
|
|
|
(defun bidi-string-mark-left-to-right (str)
|
2011-08-12 15:43:30 +00:00
|
|
|
|
"Return a string that can be safely inserted in left-to-right text.
|
|
|
|
|
|
2011-08-18 15:53:29 +00:00
|
|
|
|
Normally, inserting a string with right-to-left (RTL) script into
|
|
|
|
|
a buffer may cause some subsequent text to be displayed as part
|
|
|
|
|
of the RTL segment (usually this affects punctuation characters).
|
|
|
|
|
This function returns a string which displays as STR but forces
|
|
|
|
|
subsequent text to be displayed as left-to-right.
|
2011-08-12 15:43:30 +00:00
|
|
|
|
|
2011-08-18 15:53:29 +00:00
|
|
|
|
If STR contains any RTL character, this function returns a string
|
|
|
|
|
consisting of STR followed by an invisible left-to-right mark
|
|
|
|
|
\(LRM) character. Otherwise, it returns STR."
|
2011-08-10 19:03:56 +00:00
|
|
|
|
(unless (stringp str)
|
|
|
|
|
(signal 'wrong-type-argument (list 'stringp str)))
|
2011-08-18 15:53:29 +00:00
|
|
|
|
(if (string-match "\\cR" str)
|
|
|
|
|
(concat str (propertize (string ?\x200e) 'invisible t))
|
|
|
|
|
str))
|
2013-06-05 14:57:45 +00:00
|
|
|
|
|
|
|
|
|
;;;; Specifying things to do later.
|
|
|
|
|
|
|
|
|
|
(defun load-history-regexp (file)
|
|
|
|
|
"Form a regexp to find FILE in `load-history'.
|
|
|
|
|
FILE, a string, is described in the function `eval-after-load'."
|
|
|
|
|
(if (file-name-absolute-p file)
|
|
|
|
|
(setq file (file-truename file)))
|
|
|
|
|
(concat (if (file-name-absolute-p file) "\\`" "\\(\\`\\|/\\)")
|
|
|
|
|
(regexp-quote file)
|
|
|
|
|
(if (file-name-extension file)
|
|
|
|
|
""
|
|
|
|
|
;; Note: regexp-opt can't be used here, since we need to call
|
|
|
|
|
;; this before Emacs has been fully started. 2006-05-21
|
|
|
|
|
(concat "\\(" (mapconcat 'regexp-quote load-suffixes "\\|") "\\)?"))
|
|
|
|
|
"\\(" (mapconcat 'regexp-quote jka-compr-load-suffixes "\\|")
|
|
|
|
|
"\\)?\\'"))
|
|
|
|
|
|
|
|
|
|
(defun load-history-filename-element (file-regexp)
|
|
|
|
|
"Get the first elt of `load-history' whose car matches FILE-REGEXP.
|
|
|
|
|
Return nil if there isn't one."
|
|
|
|
|
(let* ((loads load-history)
|
|
|
|
|
(load-elt (and loads (car loads))))
|
|
|
|
|
(save-match-data
|
|
|
|
|
(while (and loads
|
|
|
|
|
(or (null (car load-elt))
|
|
|
|
|
(not (string-match file-regexp (car load-elt)))))
|
|
|
|
|
(setq loads (cdr loads)
|
|
|
|
|
load-elt (and loads (car loads)))))
|
|
|
|
|
load-elt))
|
|
|
|
|
|
|
|
|
|
(put 'eval-after-load 'lisp-indent-function 1)
|
|
|
|
|
(defun eval-after-load (file form)
|
|
|
|
|
"Arrange that if FILE is loaded, FORM will be run immediately afterwards.
|
|
|
|
|
If FILE is already loaded, evaluate FORM right now.
|
2013-06-13 22:24:52 +00:00
|
|
|
|
FORM can be an Elisp expression (in which case it's passed to `eval'),
|
|
|
|
|
or a function (in which case it's passed to `funcall' with no argument).
|
2013-06-05 14:57:45 +00:00
|
|
|
|
|
|
|
|
|
If a matching file is loaded again, FORM will be evaluated again.
|
|
|
|
|
|
|
|
|
|
If FILE is a string, it may be either an absolute or a relative file
|
2013-06-11 16:51:12 +00:00
|
|
|
|
name, and may have an extension (e.g. \".el\") or may lack one, and
|
2013-06-05 14:57:45 +00:00
|
|
|
|
additionally may or may not have an extension denoting a compressed
|
2013-06-11 16:51:12 +00:00
|
|
|
|
format (e.g. \".gz\").
|
2013-06-05 14:57:45 +00:00
|
|
|
|
|
|
|
|
|
When FILE is absolute, this first converts it to a true name by chasing
|
2013-06-11 16:51:12 +00:00
|
|
|
|
symbolic links. Only a file of this name (see next paragraph regarding
|
2013-06-05 14:57:45 +00:00
|
|
|
|
extensions) will trigger the evaluation of FORM. When FILE is relative,
|
|
|
|
|
a file whose absolute true name ends in FILE will trigger evaluation.
|
|
|
|
|
|
|
|
|
|
When FILE lacks an extension, a file name with any extension will trigger
|
|
|
|
|
evaluation. Otherwise, its extension must match FILE's. A further
|
2013-06-11 16:51:12 +00:00
|
|
|
|
extension for a compressed format (e.g. \".gz\") on FILE will not affect
|
2013-06-05 14:57:45 +00:00
|
|
|
|
this name matching.
|
|
|
|
|
|
|
|
|
|
Alternatively, FILE can be a feature (i.e. a symbol), in which case FORM
|
|
|
|
|
is evaluated at the end of any file that `provide's this feature.
|
|
|
|
|
If the feature is provided when evaluating code not associated with a
|
|
|
|
|
file, FORM is evaluated immediately after the provide statement.
|
|
|
|
|
|
|
|
|
|
Usually FILE is just a library name like \"font-lock\" or a feature name
|
|
|
|
|
like 'font-lock.
|
|
|
|
|
|
|
|
|
|
This function makes or adds to an entry on `after-load-alist'."
|
2013-06-13 22:24:52 +00:00
|
|
|
|
(declare (compiler-macro
|
|
|
|
|
(lambda (whole)
|
|
|
|
|
(if (eq 'quote (car-safe form))
|
|
|
|
|
;; Quote with lambda so the compiler can look inside.
|
|
|
|
|
`(eval-after-load ,file (lambda () ,(nth 1 form)))
|
|
|
|
|
whole))))
|
2013-06-05 14:57:45 +00:00
|
|
|
|
;; Add this FORM into after-load-alist (regardless of whether we'll be
|
|
|
|
|
;; evaluating it now).
|
|
|
|
|
(let* ((regexp-or-feature
|
|
|
|
|
(if (stringp file)
|
|
|
|
|
(setq file (purecopy (load-history-regexp file)))
|
|
|
|
|
file))
|
2013-06-13 22:24:52 +00:00
|
|
|
|
(elt (assoc regexp-or-feature after-load-alist))
|
|
|
|
|
(func
|
|
|
|
|
(if (functionp form) form
|
|
|
|
|
;; Try to use the "current" lexical/dynamic mode for `form'.
|
|
|
|
|
(eval `(lambda () ,form) lexical-binding))))
|
2013-06-05 14:57:45 +00:00
|
|
|
|
(unless elt
|
|
|
|
|
(setq elt (list regexp-or-feature))
|
|
|
|
|
(push elt after-load-alist))
|
|
|
|
|
;; Is there an already loaded file whose name (or `provide' name)
|
|
|
|
|
;; matches FILE?
|
|
|
|
|
(prog1 (if (if (stringp file)
|
|
|
|
|
(load-history-filename-element regexp-or-feature)
|
|
|
|
|
(featurep file))
|
2013-06-13 22:24:52 +00:00
|
|
|
|
(funcall func))
|
|
|
|
|
(let ((delayed-func
|
|
|
|
|
(if (not (symbolp regexp-or-feature)) func
|
|
|
|
|
;; For features, the after-load-alist elements get run when
|
|
|
|
|
;; `provide' is called rather than at the end of the file.
|
|
|
|
|
;; So add an indirection to make sure that `func' is really run
|
|
|
|
|
;; "after-load" in case the provide call happens early.
|
|
|
|
|
(lambda ()
|
|
|
|
|
(if (not load-file-name)
|
|
|
|
|
;; Not being provided from a file, run func right now.
|
|
|
|
|
(funcall func)
|
2013-06-14 04:11:00 +00:00
|
|
|
|
(let ((lfn load-file-name)
|
|
|
|
|
;; Don't use letrec, because equal (in
|
|
|
|
|
;; add/remove-hook) would get trapped in a cycle.
|
|
|
|
|
(fun (make-symbol "eval-after-load-helper")))
|
|
|
|
|
(fset fun (lambda (file)
|
|
|
|
|
(when (equal file lfn)
|
|
|
|
|
(remove-hook 'after-load-functions fun)
|
|
|
|
|
(funcall func))))
|
2013-09-17 07:26:07 +00:00
|
|
|
|
(add-hook 'after-load-functions fun 'append)))))))
|
2013-06-13 22:24:52 +00:00
|
|
|
|
;; Add FORM to the element unless it's already there.
|
|
|
|
|
(unless (member delayed-func (cdr elt))
|
|
|
|
|
(nconc elt (list delayed-func)))))))
|
|
|
|
|
|
|
|
|
|
(defmacro with-eval-after-load (file &rest body)
|
|
|
|
|
"Execute BODY after FILE is loaded.
|
|
|
|
|
FILE is normally a feature name, but it can also be a file name,
|
|
|
|
|
in case that file does not provide any feature."
|
|
|
|
|
(declare (indent 1) (debug t))
|
|
|
|
|
`(eval-after-load ,file (lambda () ,@body)))
|
2013-06-05 14:57:45 +00:00
|
|
|
|
|
|
|
|
|
(defvar after-load-functions nil
|
|
|
|
|
"Special hook run after loading a file.
|
|
|
|
|
Each function there is called with a single argument, the absolute
|
|
|
|
|
name of the file just loaded.")
|
|
|
|
|
|
|
|
|
|
(defun do-after-load-evaluation (abs-file)
|
|
|
|
|
"Evaluate all `eval-after-load' forms, if any, for ABS-FILE.
|
|
|
|
|
ABS-FILE, a string, should be the absolute true name of a file just loaded.
|
|
|
|
|
This function is called directly from the C code."
|
|
|
|
|
;; Run the relevant eval-after-load forms.
|
2013-06-13 22:24:52 +00:00
|
|
|
|
(dolist (a-l-element after-load-alist)
|
|
|
|
|
(when (and (stringp (car a-l-element))
|
|
|
|
|
(string-match-p (car a-l-element) abs-file))
|
|
|
|
|
;; discard the file name regexp
|
|
|
|
|
(mapc #'funcall (cdr a-l-element))))
|
2013-06-05 14:57:45 +00:00
|
|
|
|
;; Complain when the user uses obsolete files.
|
|
|
|
|
(when (string-match-p "/obsolete/[^/]*\\'" abs-file)
|
2013-09-12 06:37:02 +00:00
|
|
|
|
;; Maybe we should just use display-warning? This seems yucky...
|
|
|
|
|
(let* ((file (file-name-nondirectory abs-file))
|
|
|
|
|
(msg (format "Package %s is obsolete!"
|
|
|
|
|
(substring file 0
|
|
|
|
|
(string-match "\\.elc?\\>" file)))))
|
|
|
|
|
;; Cribbed from cl--compiling-file.
|
|
|
|
|
(if (and (boundp 'byte-compile--outbuffer)
|
|
|
|
|
(bufferp (symbol-value 'byte-compile--outbuffer))
|
|
|
|
|
(equal (buffer-name (symbol-value 'byte-compile--outbuffer))
|
|
|
|
|
" *Compiler Output*"))
|
|
|
|
|
;; Don't warn about obsolete files using other obsolete files.
|
|
|
|
|
(unless (and (stringp byte-compile-current-file)
|
|
|
|
|
(string-match-p "/obsolete/[^/]*\\'"
|
|
|
|
|
(expand-file-name
|
|
|
|
|
byte-compile-current-file
|
|
|
|
|
byte-compile-root-dir)))
|
|
|
|
|
(byte-compile-log-warning msg))
|
|
|
|
|
(run-with-timer 0 nil
|
|
|
|
|
(lambda (msg)
|
|
|
|
|
(message "%s" msg)) msg))))
|
|
|
|
|
|
2013-06-05 14:57:45 +00:00
|
|
|
|
;; Finally, run any other hook.
|
|
|
|
|
(run-hook-with-args 'after-load-functions abs-file))
|
|
|
|
|
|
|
|
|
|
(defun eval-next-after-load (file)
|
|
|
|
|
"Read the following input sexp, and run it whenever FILE is loaded.
|
|
|
|
|
This makes or adds to an entry on `after-load-alist'.
|
|
|
|
|
FILE should be the name of a library, with no directory name."
|
|
|
|
|
(declare (obsolete eval-after-load "23.2"))
|
|
|
|
|
(eval-after-load file (read)))
|
|
|
|
|
|
2013-07-11 01:49:17 +00:00
|
|
|
|
|
2013-06-05 14:57:45 +00:00
|
|
|
|
(defun display-delayed-warnings ()
|
|
|
|
|
"Display delayed warnings from `delayed-warnings-list'.
|
|
|
|
|
Used from `delayed-warnings-hook' (which see)."
|
|
|
|
|
(dolist (warning (nreverse delayed-warnings-list))
|
|
|
|
|
(apply 'display-warning warning))
|
|
|
|
|
(setq delayed-warnings-list nil))
|
|
|
|
|
|
|
|
|
|
(defun collapse-delayed-warnings ()
|
|
|
|
|
"Remove duplicates from `delayed-warnings-list'.
|
|
|
|
|
Collapse identical adjacent warnings into one (plus count).
|
|
|
|
|
Used from `delayed-warnings-hook' (which see)."
|
|
|
|
|
(let ((count 1)
|
|
|
|
|
collapsed warning)
|
|
|
|
|
(while delayed-warnings-list
|
|
|
|
|
(setq warning (pop delayed-warnings-list))
|
|
|
|
|
(if (equal warning (car delayed-warnings-list))
|
|
|
|
|
(setq count (1+ count))
|
|
|
|
|
(when (> count 1)
|
|
|
|
|
(setcdr warning (cons (format "%s [%d times]" (cadr warning) count)
|
|
|
|
|
(cddr warning)))
|
|
|
|
|
(setq count 1))
|
|
|
|
|
(push warning collapsed)))
|
|
|
|
|
(setq delayed-warnings-list (nreverse collapsed))))
|
|
|
|
|
|
|
|
|
|
;; At present this is only used for Emacs internals.
|
|
|
|
|
;; Ref http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00085.html
|
|
|
|
|
(defvar delayed-warnings-hook '(collapse-delayed-warnings
|
|
|
|
|
display-delayed-warnings)
|
|
|
|
|
"Normal hook run to process and display delayed warnings.
|
|
|
|
|
By default, this hook contains functions to consolidate the
|
|
|
|
|
warnings listed in `delayed-warnings-list', display them, and set
|
|
|
|
|
`delayed-warnings-list' back to nil.")
|
|
|
|
|
|
2013-07-11 01:49:17 +00:00
|
|
|
|
(defun delay-warning (type message &optional level buffer-name)
|
|
|
|
|
"Display a delayed warning.
|
|
|
|
|
Aside from going through `delayed-warnings-list', this is equivalent
|
|
|
|
|
to `display-warning'."
|
|
|
|
|
(push (list type message level buffer-name) delayed-warnings-list))
|
|
|
|
|
|
2009-11-25 03:59:19 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; invisibility specs
|
2004-12-06 15:11:51 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(defun add-to-invisibility-spec (element)
|
|
|
|
|
"Add ELEMENT to `buffer-invisibility-spec'.
|
|
|
|
|
See documentation for `buffer-invisibility-spec' for the kind of elements
|
|
|
|
|
that can be added."
|
|
|
|
|
(if (eq buffer-invisibility-spec t)
|
|
|
|
|
(setq buffer-invisibility-spec (list t)))
|
|
|
|
|
(setq buffer-invisibility-spec
|
|
|
|
|
(cons element buffer-invisibility-spec)))
|
|
|
|
|
|
|
|
|
|
(defun remove-from-invisibility-spec (element)
|
|
|
|
|
"Remove ELEMENT from `buffer-invisibility-spec'."
|
|
|
|
|
(if (consp buffer-invisibility-spec)
|
2007-04-09 23:10:00 +00:00
|
|
|
|
(setq buffer-invisibility-spec
|
|
|
|
|
(delete element buffer-invisibility-spec))))
|
1996-09-28 04:16:00 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Syntax tables.
|
|
|
|
|
|
|
|
|
|
(defmacro with-syntax-table (table &rest body)
|
|
|
|
|
"Evaluate BODY with syntax table of current buffer set to TABLE.
|
|
|
|
|
The syntax table of the current buffer is saved, BODY is evaluated, and the
|
|
|
|
|
saved table is restored, even in case of an abnormal exit.
|
|
|
|
|
Value is what BODY returns."
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 13:03:05 +00:00
|
|
|
|
(declare (debug t) (indent 1))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
(let ((old-table (make-symbol "table"))
|
|
|
|
|
(old-buffer (make-symbol "buffer")))
|
|
|
|
|
`(let ((,old-table (syntax-table))
|
|
|
|
|
(,old-buffer (current-buffer)))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(set-syntax-table ,table)
|
|
|
|
|
,@body)
|
|
|
|
|
(save-current-buffer
|
|
|
|
|
(set-buffer ,old-buffer)
|
|
|
|
|
(set-syntax-table ,old-table))))))
|
1993-12-31 09:25:12 +00:00
|
|
|
|
|
1994-02-08 05:06:07 +00:00
|
|
|
|
(defun make-syntax-table (&optional oldtable)
|
1994-01-03 07:41:00 +00:00
|
|
|
|
"Return a new syntax table.
|
2001-11-08 00:57:57 +00:00
|
|
|
|
Create a syntax table which inherits from OLDTABLE (if non-nil) or
|
|
|
|
|
from `standard-syntax-table' otherwise."
|
|
|
|
|
(let ((table (make-char-table 'syntax-table nil)))
|
|
|
|
|
(set-char-table-parent table (or oldtable (standard-syntax-table)))
|
|
|
|
|
table))
|
1997-03-11 23:55:24 +00:00
|
|
|
|
|
2002-09-09 23:13:18 +00:00
|
|
|
|
(defun syntax-after (pos)
|
2012-09-08 14:23:01 +00:00
|
|
|
|
"Return the raw syntax descriptor for the char after POS.
|
2005-04-24 14:50:20 +00:00
|
|
|
|
If POS is outside the buffer's accessible portion, return nil."
|
2002-09-09 23:13:18 +00:00
|
|
|
|
(unless (or (< pos (point-min)) (>= pos (point-max)))
|
2004-11-22 06:00:51 +00:00
|
|
|
|
(let ((st (if parse-sexp-lookup-properties
|
|
|
|
|
(get-char-property pos 'syntax-table))))
|
|
|
|
|
(if (consp st) st
|
|
|
|
|
(aref (or st (syntax-table)) (char-after pos))))))
|
2002-09-09 23:13:18 +00:00
|
|
|
|
|
2005-04-19 18:11:26 +00:00
|
|
|
|
(defun syntax-class (syntax)
|
2012-09-08 14:23:01 +00:00
|
|
|
|
"Return the code for the syntax class described by SYNTAX.
|
|
|
|
|
|
|
|
|
|
SYNTAX should be a raw syntax descriptor; the return value is a
|
|
|
|
|
integer which encodes the corresponding syntax class. See Info
|
|
|
|
|
node `(elisp)Syntax Table Internals' for a list of codes.
|
|
|
|
|
|
2005-04-24 14:50:20 +00:00
|
|
|
|
If SYNTAX is nil, return nil."
|
|
|
|
|
(and syntax (logand (car syntax) 65535)))
|
2002-04-19 00:06:54 +00:00
|
|
|
|
|
2013-03-30 01:32:12 +00:00
|
|
|
|
;; Utility motion commands
|
|
|
|
|
|
|
|
|
|
;; Whitespace
|
|
|
|
|
|
|
|
|
|
(defun forward-whitespace (arg)
|
|
|
|
|
"Move point to the end of the next sequence of whitespace chars.
|
|
|
|
|
Each such sequence may be a single newline, or a sequence of
|
|
|
|
|
consecutive space and/or tab characters.
|
|
|
|
|
With prefix argument ARG, do it ARG times if positive, or move
|
|
|
|
|
backwards ARG times if negative."
|
|
|
|
|
(interactive "^p")
|
|
|
|
|
(if (natnump arg)
|
|
|
|
|
(re-search-forward "[ \t]+\\|\n" nil 'move arg)
|
|
|
|
|
(while (< arg 0)
|
|
|
|
|
(if (re-search-backward "[ \t]+\\|\n" nil 'move)
|
|
|
|
|
(or (eq (char-after (match-beginning 0)) ?\n)
|
|
|
|
|
(skip-chars-backward " \t")))
|
|
|
|
|
(setq arg (1+ arg)))))
|
|
|
|
|
|
|
|
|
|
;; Symbols
|
|
|
|
|
|
|
|
|
|
(defun forward-symbol (arg)
|
|
|
|
|
"Move point to the next position that is the end of a symbol.
|
|
|
|
|
A symbol is any sequence of characters that are in either the
|
|
|
|
|
word constituent or symbol constituent syntax class.
|
|
|
|
|
With prefix argument ARG, do it ARG times if positive, or move
|
|
|
|
|
backwards ARG times if negative."
|
|
|
|
|
(interactive "^p")
|
|
|
|
|
(if (natnump arg)
|
|
|
|
|
(re-search-forward "\\(\\sw\\|\\s_\\)+" nil 'move arg)
|
|
|
|
|
(while (< arg 0)
|
|
|
|
|
(if (re-search-backward "\\(\\sw\\|\\s_\\)+" nil 'move)
|
|
|
|
|
(skip-syntax-backward "w_"))
|
|
|
|
|
(setq arg (1+ arg)))))
|
|
|
|
|
|
|
|
|
|
;; Syntax blocks
|
|
|
|
|
|
|
|
|
|
(defun forward-same-syntax (&optional arg)
|
|
|
|
|
"Move point past all characters with the same syntax class.
|
|
|
|
|
With prefix argument ARG, do it ARG times if positive, or move
|
|
|
|
|
backwards ARG times if negative."
|
|
|
|
|
(interactive "^p")
|
|
|
|
|
(or arg (setq arg 1))
|
|
|
|
|
(while (< arg 0)
|
|
|
|
|
(skip-syntax-backward
|
|
|
|
|
(char-to-string (char-syntax (char-before))))
|
|
|
|
|
(setq arg (1+ arg)))
|
|
|
|
|
(while (> arg 0)
|
|
|
|
|
(skip-syntax-forward (char-to-string (char-syntax (char-after))))
|
|
|
|
|
(setq arg (1- arg))))
|
|
|
|
|
|
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Text clones
|
2001-10-25 02:26:41 +00:00
|
|
|
|
|
2013-08-04 20:18:11 +00:00
|
|
|
|
(defvar text-clone--maintaining nil)
|
|
|
|
|
|
|
|
|
|
(defun text-clone--maintain (ol1 after beg end &optional _len)
|
2001-10-25 02:26:41 +00:00
|
|
|
|
"Propagate the changes made under the overlay OL1 to the other clones.
|
|
|
|
|
This is used on the `modification-hooks' property of text clones."
|
2013-08-04 20:18:11 +00:00
|
|
|
|
(when (and after (not undo-in-progress)
|
|
|
|
|
(not text-clone--maintaining)
|
|
|
|
|
(overlay-start ol1))
|
2001-10-25 02:26:41 +00:00
|
|
|
|
(let ((margin (if (overlay-get ol1 'text-clone-spreadp) 1 0)))
|
|
|
|
|
(setq beg (max beg (+ (overlay-start ol1) margin)))
|
|
|
|
|
(setq end (min end (- (overlay-end ol1) margin)))
|
|
|
|
|
(when (<= beg end)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(when (overlay-get ol1 'text-clone-syntax)
|
|
|
|
|
;; Check content of the clone's text.
|
|
|
|
|
(let ((cbeg (+ (overlay-start ol1) margin))
|
|
|
|
|
(cend (- (overlay-end ol1) margin)))
|
|
|
|
|
(goto-char cbeg)
|
|
|
|
|
(save-match-data
|
|
|
|
|
(if (not (re-search-forward
|
|
|
|
|
(overlay-get ol1 'text-clone-syntax) cend t))
|
|
|
|
|
;; Mark the overlay for deletion.
|
2012-12-07 16:25:28 +00:00
|
|
|
|
(setq end cbeg)
|
2001-10-25 02:26:41 +00:00
|
|
|
|
(when (< (match-end 0) cend)
|
|
|
|
|
;; Shrink the clone at its end.
|
|
|
|
|
(setq end (min end (match-end 0)))
|
|
|
|
|
(move-overlay ol1 (overlay-start ol1)
|
|
|
|
|
(+ (match-end 0) margin)))
|
|
|
|
|
(when (> (match-beginning 0) cbeg)
|
|
|
|
|
;; Shrink the clone at its beginning.
|
|
|
|
|
(setq beg (max (match-beginning 0) beg))
|
|
|
|
|
(move-overlay ol1 (- (match-beginning 0) margin)
|
|
|
|
|
(overlay-end ol1)))))))
|
|
|
|
|
;; Now go ahead and update the clones.
|
|
|
|
|
(let ((head (- beg (overlay-start ol1)))
|
|
|
|
|
(tail (- (overlay-end ol1) end))
|
|
|
|
|
(str (buffer-substring beg end))
|
|
|
|
|
(nothing-left t)
|
2013-08-04 20:18:11 +00:00
|
|
|
|
(text-clone--maintaining t))
|
2001-10-25 02:26:41 +00:00
|
|
|
|
(dolist (ol2 (overlay-get ol1 'text-clones))
|
|
|
|
|
(let ((oe (overlay-end ol2)))
|
|
|
|
|
(unless (or (eq ol1 ol2) (null oe))
|
|
|
|
|
(setq nothing-left nil)
|
|
|
|
|
(let ((mod-beg (+ (overlay-start ol2) head)))
|
|
|
|
|
;;(overlay-put ol2 'modification-hooks nil)
|
|
|
|
|
(goto-char (- (overlay-end ol2) tail))
|
|
|
|
|
(unless (> mod-beg (point))
|
|
|
|
|
(save-excursion (insert str))
|
|
|
|
|
(delete-region mod-beg (point)))
|
2013-08-04 20:18:11 +00:00
|
|
|
|
;;(overlay-put ol2 'modification-hooks '(text-clone--maintain))
|
2001-10-25 02:26:41 +00:00
|
|
|
|
))))
|
|
|
|
|
(if nothing-left (delete-overlay ol1))))))))
|
|
|
|
|
|
|
|
|
|
(defun text-clone-create (start end &optional spreadp syntax)
|
|
|
|
|
"Create a text clone of START...END at point.
|
|
|
|
|
Text clones are chunks of text that are automatically kept identical:
|
|
|
|
|
changes done to one of the clones will be immediately propagated to the other.
|
|
|
|
|
|
|
|
|
|
The buffer's content at point is assumed to be already identical to
|
|
|
|
|
the one between START and END.
|
|
|
|
|
If SYNTAX is provided it's a regexp that describes the possible text of
|
|
|
|
|
the clones; the clone will be shrunk or killed if necessary to ensure that
|
|
|
|
|
its text matches the regexp.
|
|
|
|
|
If SPREADP is non-nil it indicates that text inserted before/after the
|
|
|
|
|
clone should be incorporated in the clone."
|
|
|
|
|
;; To deal with SPREADP we can either use an overlay with `nil t' along
|
|
|
|
|
;; with insert-(behind|in-front-of)-hooks or use a slightly larger overlay
|
|
|
|
|
;; (with a one-char margin at each end) with `t nil'.
|
|
|
|
|
;; We opted for a larger overlay because it behaves better in the case
|
|
|
|
|
;; where the clone is reduced to the empty string (we want the overlay to
|
|
|
|
|
;; stay when the clone's content is the empty string and we want to use
|
|
|
|
|
;; `evaporate' to make sure those overlays get deleted when needed).
|
2002-10-17 15:42:10 +00:00
|
|
|
|
;;
|
2001-10-25 02:26:41 +00:00
|
|
|
|
(let* ((pt-end (+ (point) (- end start)))
|
|
|
|
|
(start-margin (if (or (not spreadp) (bobp) (<= start (point-min)))
|
|
|
|
|
0 1))
|
|
|
|
|
(end-margin (if (or (not spreadp)
|
|
|
|
|
(>= pt-end (point-max))
|
|
|
|
|
(>= start (point-max)))
|
|
|
|
|
0 1))
|
2013-08-04 20:18:11 +00:00
|
|
|
|
;; FIXME: Reuse overlays at point to extend dups!
|
2001-10-25 02:26:41 +00:00
|
|
|
|
(ol1 (make-overlay (- start start-margin) (+ end end-margin) nil t))
|
|
|
|
|
(ol2 (make-overlay (- (point) start-margin) (+ pt-end end-margin) nil t))
|
|
|
|
|
(dups (list ol1 ol2)))
|
2013-08-04 20:18:11 +00:00
|
|
|
|
(overlay-put ol1 'modification-hooks '(text-clone--maintain))
|
2001-10-25 02:26:41 +00:00
|
|
|
|
(when spreadp (overlay-put ol1 'text-clone-spreadp t))
|
|
|
|
|
(when syntax (overlay-put ol1 'text-clone-syntax syntax))
|
|
|
|
|
;;(overlay-put ol1 'face 'underline)
|
|
|
|
|
(overlay-put ol1 'evaporate t)
|
|
|
|
|
(overlay-put ol1 'text-clones dups)
|
2002-10-17 15:42:10 +00:00
|
|
|
|
;;
|
2013-08-04 20:18:11 +00:00
|
|
|
|
(overlay-put ol2 'modification-hooks '(text-clone--maintain))
|
2001-10-25 02:26:41 +00:00
|
|
|
|
(when spreadp (overlay-put ol2 'text-clone-spreadp t))
|
|
|
|
|
(when syntax (overlay-put ol2 'text-clone-syntax syntax))
|
|
|
|
|
;;(overlay-put ol2 'face 'underline)
|
|
|
|
|
(overlay-put ol2 'evaporate t)
|
|
|
|
|
(overlay-put ol2 'text-clones dups)))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
|
|
|
|
;;;; Mail user agents.
|
2002-09-11 20:23:56 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;; Here we include just enough for other packages to be able
|
|
|
|
|
;; to define them.
|
2002-04-07 10:09:39 +00:00
|
|
|
|
|
2002-09-11 20:23:56 +00:00
|
|
|
|
(defun define-mail-user-agent (symbol composefunc sendfunc
|
|
|
|
|
&optional abortfunc hookvar)
|
|
|
|
|
"Define a symbol to identify a mail-sending package for `mail-user-agent'.
|
|
|
|
|
|
|
|
|
|
SYMBOL can be any Lisp symbol. Its function definition and/or
|
|
|
|
|
value as a variable do not matter for this usage; we use only certain
|
|
|
|
|
properties on its property list, to encode the rest of the arguments.
|
|
|
|
|
|
|
|
|
|
COMPOSEFUNC is program callable function that composes an outgoing
|
|
|
|
|
mail message buffer. This function should set up the basics of the
|
|
|
|
|
buffer without requiring user interaction. It should populate the
|
|
|
|
|
standard mail headers, leaving the `to:' and `subject:' headers blank
|
|
|
|
|
by default.
|
|
|
|
|
|
|
|
|
|
COMPOSEFUNC should accept several optional arguments--the same
|
|
|
|
|
arguments that `compose-mail' takes. See that function's documentation.
|
|
|
|
|
|
|
|
|
|
SENDFUNC is the command a user would run to send the message.
|
|
|
|
|
|
|
|
|
|
Optional ABORTFUNC is the command a user would run to abort the
|
|
|
|
|
message. For mail packages that don't have a separate abort function,
|
|
|
|
|
this can be `kill-buffer' (the equivalent of omitting this argument).
|
|
|
|
|
|
|
|
|
|
Optional HOOKVAR is a hook variable that gets run before the message
|
|
|
|
|
is actually sent. Callers that use the `mail-user-agent' may
|
|
|
|
|
install a hook function temporarily on this hook variable.
|
|
|
|
|
If HOOKVAR is nil, `mail-send-hook' is used.
|
|
|
|
|
|
|
|
|
|
The properties used on SYMBOL are `composefunc', `sendfunc',
|
|
|
|
|
`abortfunc', and `hookvar'."
|
|
|
|
|
(put symbol 'composefunc composefunc)
|
|
|
|
|
(put symbol 'sendfunc sendfunc)
|
|
|
|
|
(put symbol 'abortfunc (or abortfunc 'kill-buffer))
|
|
|
|
|
(put symbol 'hookvar (or hookvar 'mail-send-hook)))
|
2005-10-22 15:01:08 +00:00
|
|
|
|
|
2012-11-20 04:24:09 +00:00
|
|
|
|
(defvar called-interactively-p-functions nil
|
|
|
|
|
"Special hook called to skip special frames in `called-interactively-p'.
|
|
|
|
|
The functions are called with 3 arguments: (I FRAME1 FRAME2),
|
|
|
|
|
where FRAME1 is a \"current frame\", FRAME2 is the next frame,
|
|
|
|
|
I is the index of the frame after FRAME2. It should return nil
|
|
|
|
|
if those frames don't seem special and otherwise, it should return
|
|
|
|
|
the number of frames to skip (minus 1).")
|
|
|
|
|
|
2013-09-20 19:59:42 +00:00
|
|
|
|
(defconst internal--call-interactively (symbol-function 'call-interactively))
|
|
|
|
|
|
2012-11-20 04:24:09 +00:00
|
|
|
|
(defun called-interactively-p (&optional kind)
|
|
|
|
|
"Return t if the containing function was called by `call-interactively'.
|
|
|
|
|
If KIND is `interactive', then only return t if the call was made
|
|
|
|
|
interactively by the user, i.e. not in `noninteractive' mode nor
|
|
|
|
|
when `executing-kbd-macro'.
|
|
|
|
|
If KIND is `any', on the other hand, it will return t for any kind of
|
|
|
|
|
interactive call, including being called as the binding of a key or
|
|
|
|
|
from a keyboard macro, even in `noninteractive' mode.
|
|
|
|
|
|
|
|
|
|
This function is very brittle, it may fail to return the intended result when
|
|
|
|
|
the code is debugged, advised, or instrumented in some form. Some macros and
|
|
|
|
|
special forms (such as `condition-case') may also sometimes wrap their bodies
|
|
|
|
|
in a `lambda', so any call to `called-interactively-p' from those bodies will
|
|
|
|
|
indicate whether that lambda (rather than the surrounding function) was called
|
|
|
|
|
interactively.
|
|
|
|
|
|
|
|
|
|
Instead of using this function, it is cleaner and more reliable to give your
|
|
|
|
|
function an extra optional argument whose `interactive' spec specifies
|
|
|
|
|
non-nil unconditionally (\"p\" is a good way to do this), or via
|
|
|
|
|
\(not (or executing-kbd-macro noninteractive)).
|
|
|
|
|
|
|
|
|
|
The only known proper use of `interactive' for KIND is in deciding
|
|
|
|
|
whether to display a helpful message, or how to display it. If you're
|
|
|
|
|
thinking of using it for any other purpose, it is quite likely that
|
|
|
|
|
you're making a mistake. Think: what do you want to do when the
|
|
|
|
|
command is called from a keyboard macro?"
|
|
|
|
|
(declare (advertised-calling-convention (kind) "23.1"))
|
|
|
|
|
(when (not (and (eq kind 'interactive)
|
|
|
|
|
(or executing-kbd-macro noninteractive)))
|
|
|
|
|
(let* ((i 1) ;; 0 is the called-interactively-p frame.
|
|
|
|
|
frame nextframe
|
|
|
|
|
(get-next-frame
|
|
|
|
|
(lambda ()
|
|
|
|
|
(setq frame nextframe)
|
2013-07-26 07:38:18 +00:00
|
|
|
|
(setq nextframe (backtrace-frame i 'called-interactively-p))
|
2012-11-20 04:24:09 +00:00
|
|
|
|
;; (message "Frame %d = %S" i nextframe)
|
|
|
|
|
(setq i (1+ i)))))
|
|
|
|
|
(funcall get-next-frame) ;; Get the first frame.
|
|
|
|
|
(while
|
|
|
|
|
;; FIXME: The edebug and advice handling should be made modular and
|
|
|
|
|
;; provided directly by edebug.el and nadvice.el.
|
|
|
|
|
(progn
|
|
|
|
|
;; frame =(backtrace-frame i-2)
|
|
|
|
|
;; nextframe=(backtrace-frame i-1)
|
|
|
|
|
(funcall get-next-frame)
|
|
|
|
|
;; `pcase' would be a fairly good fit here, but it sometimes moves
|
|
|
|
|
;; branches within local functions, which then messes up the
|
|
|
|
|
;; `backtrace-frame' data we get,
|
|
|
|
|
(or
|
|
|
|
|
;; Skip special forms (from non-compiled code).
|
|
|
|
|
(and frame (null (car frame)))
|
|
|
|
|
;; Skip also `interactive-p' (because we don't want to know if
|
|
|
|
|
;; interactive-p was called interactively but if it's caller was)
|
|
|
|
|
;; and `byte-code' (idem; this appears in subexpressions of things
|
|
|
|
|
;; like condition-case, which are wrapped in a separate bytecode
|
|
|
|
|
;; chunk).
|
|
|
|
|
;; FIXME: For lexical-binding code, this is much worse,
|
|
|
|
|
;; because the frames look like "byte-code -> funcall -> #[...]",
|
|
|
|
|
;; which is not a reliable signature.
|
|
|
|
|
(memq (nth 1 frame) '(interactive-p 'byte-code))
|
|
|
|
|
;; Skip package-specific stack-frames.
|
|
|
|
|
(let ((skip (run-hook-with-args-until-success
|
|
|
|
|
'called-interactively-p-functions
|
|
|
|
|
i frame nextframe)))
|
|
|
|
|
(pcase skip
|
|
|
|
|
(`nil nil)
|
|
|
|
|
(`0 t)
|
|
|
|
|
(_ (setq i (+ i skip -1)) (funcall get-next-frame)))))))
|
|
|
|
|
;; Now `frame' should be "the function from which we were called".
|
|
|
|
|
(pcase (cons frame nextframe)
|
|
|
|
|
;; No subr calls `interactive-p', so we can rule that out.
|
|
|
|
|
(`((,_ ,(pred (lambda (f) (subrp (indirect-function f)))) . ,_) . ,_) nil)
|
2013-09-20 19:59:42 +00:00
|
|
|
|
;; In case #<subr call-interactively> without going through the
|
|
|
|
|
;; `call-interactively' symbol (bug#3984).
|
|
|
|
|
(`(,_ . (t ,(pred (eq internal--call-interactively)) . ,_)) t)
|
2012-11-20 04:24:09 +00:00
|
|
|
|
(`(,_ . (t call-interactively . ,_)) t)))))
|
|
|
|
|
|
|
|
|
|
(defun interactive-p ()
|
|
|
|
|
"Return t if the containing function was run directly by user input.
|
|
|
|
|
This means that the function was called with `call-interactively'
|
|
|
|
|
\(which includes being called as the binding of a key)
|
|
|
|
|
and input is currently coming from the keyboard (not a keyboard macro),
|
|
|
|
|
and Emacs is not running in batch mode (`noninteractive' is nil).
|
|
|
|
|
|
|
|
|
|
The only known proper use of `interactive-p' is in deciding whether to
|
|
|
|
|
display a helpful message, or how to display it. If you're thinking
|
|
|
|
|
of using it for any other purpose, it is quite likely that you're
|
|
|
|
|
making a mistake. Think: what do you want to do when the command is
|
|
|
|
|
called from a keyboard macro or in batch mode?
|
|
|
|
|
|
|
|
|
|
To test whether your function was called with `call-interactively',
|
|
|
|
|
either (i) add an extra optional argument and give it an `interactive'
|
|
|
|
|
spec that specifies non-nil unconditionally (such as \"p\"); or (ii)
|
|
|
|
|
use `called-interactively-p'."
|
|
|
|
|
(declare (obsolete called-interactively-p "23.2"))
|
|
|
|
|
(called-interactively-p 'interactive))
|
|
|
|
|
|
2013-06-13 20:43:53 +00:00
|
|
|
|
(defun internal-push-keymap (keymap symbol)
|
|
|
|
|
(let ((map (symbol-value symbol)))
|
|
|
|
|
(unless (memq keymap map)
|
|
|
|
|
(unless (memq 'add-keymap-witness (symbol-value symbol))
|
|
|
|
|
(setq map (make-composed-keymap nil (symbol-value symbol)))
|
|
|
|
|
(push 'add-keymap-witness (cdr map))
|
|
|
|
|
(set symbol map))
|
|
|
|
|
(push keymap (cdr map)))))
|
|
|
|
|
|
|
|
|
|
(defun internal-pop-keymap (keymap symbol)
|
|
|
|
|
(let ((map (symbol-value symbol)))
|
|
|
|
|
(when (memq keymap map)
|
|
|
|
|
(setf (cdr map) (delq keymap (cdr map))))
|
|
|
|
|
(let ((tail (cddr map)))
|
|
|
|
|
(and (or (null tail) (keymapp tail))
|
|
|
|
|
(eq 'add-keymap-witness (nth 1 map))
|
|
|
|
|
(set symbol tail)))))
|
|
|
|
|
|
2013-12-31 00:27:27 +00:00
|
|
|
|
(define-obsolete-function-alias
|
|
|
|
|
'set-temporary-overlay-map 'set-transient-map "24.4")
|
|
|
|
|
|
2013-12-23 03:59:10 +00:00
|
|
|
|
(defun set-transient-map (map &optional keep-pred on-exit)
|
|
|
|
|
"Set MAP as a temporary keymap taking precedence over other keymaps.
|
|
|
|
|
Normally, MAP is used only once, to look up the very next key.
|
|
|
|
|
However, if the optional argument KEEP-PRED is t, MAP stays
|
|
|
|
|
active if a key from MAP is used. KEEP-PRED can also be a
|
|
|
|
|
function of no arguments: if it returns non-nil, then MAP stays
|
|
|
|
|
active.
|
|
|
|
|
|
|
|
|
|
Optional arg ON-EXIT, if non-nil, specifies a function that is
|
|
|
|
|
called, with no arguments, after MAP is deactivated.
|
|
|
|
|
|
2014-01-06 19:29:39 +00:00
|
|
|
|
This uses `overriding-terminal-local-map' which takes precedence over all other
|
|
|
|
|
keymaps. As usual, if no match for a key is found in MAP, the normal key
|
|
|
|
|
lookup sequence then continues."
|
2013-12-23 03:59:10 +00:00
|
|
|
|
(let ((clearfun (make-symbol "clear-transient-map")))
|
2013-06-14 04:11:00 +00:00
|
|
|
|
;; Don't use letrec, because equal (in add/remove-hook) would get trapped
|
|
|
|
|
;; in a cycle.
|
|
|
|
|
(fset clearfun
|
|
|
|
|
(lambda ()
|
2013-12-23 03:59:10 +00:00
|
|
|
|
(with-demoted-errors "set-transient-map PCH: %S"
|
2014-01-06 19:29:39 +00:00
|
|
|
|
(unless (cond
|
|
|
|
|
((not (eq map (cadr overriding-terminal-local-map)))
|
|
|
|
|
;; There's presumably some other transient-map in
|
|
|
|
|
;; effect. Wait for that one to terminate before we
|
|
|
|
|
;; remove ourselves.
|
|
|
|
|
;; For example, if isearch and C-u both use transient
|
|
|
|
|
;; maps, then the lifetime of the C-u should be nested
|
|
|
|
|
;; within isearch's, so the pre-command-hook of
|
|
|
|
|
;; isearch should be suspended during the C-u one so
|
|
|
|
|
;; we don't exit isearch just because we hit 1 after
|
|
|
|
|
;; C-u and that 1 exits isearch whereas it doesn't
|
|
|
|
|
;; exit C-u.
|
|
|
|
|
t)
|
|
|
|
|
((null keep-pred) nil)
|
|
|
|
|
((eq t keep-pred)
|
|
|
|
|
(eq this-command
|
|
|
|
|
(lookup-key map (this-command-keys-vector))))
|
|
|
|
|
(t (funcall keep-pred)))
|
2013-10-04 19:06:45 +00:00
|
|
|
|
(internal-pop-keymap map 'overriding-terminal-local-map)
|
|
|
|
|
(remove-hook 'pre-command-hook clearfun)
|
|
|
|
|
(when on-exit (funcall on-exit))))))
|
2013-06-13 20:43:53 +00:00
|
|
|
|
(add-hook 'pre-command-hook clearfun)
|
|
|
|
|
(internal-push-keymap map 'overriding-terminal-local-map)))
|
2012-05-05 01:47:04 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Progress reporters.
|
2004-10-08 17:23:40 +00:00
|
|
|
|
|
|
|
|
|
;; Progress reporter has the following structure:
|
|
|
|
|
;;
|
|
|
|
|
;; (NEXT-UPDATE-VALUE . [NEXT-UPDATE-TIME
|
|
|
|
|
;; MIN-VALUE
|
|
|
|
|
;; MAX-VALUE
|
|
|
|
|
;; MESSAGE
|
|
|
|
|
;; MIN-CHANGE
|
|
|
|
|
;; MIN-TIME])
|
|
|
|
|
;;
|
2011-11-23 07:03:56 +00:00
|
|
|
|
;; This weirdness is for optimization reasons: we want
|
2004-10-08 17:23:40 +00:00
|
|
|
|
;; `progress-reporter-update' to be as fast as possible, so
|
|
|
|
|
;; `(car reporter)' is better than `(aref reporter 0)'.
|
|
|
|
|
;;
|
|
|
|
|
;; NEXT-UPDATE-TIME is a float. While `float-time' loses a couple
|
|
|
|
|
;; digits of precision, it doesn't really matter here. On the other
|
|
|
|
|
;; hand, it greatly simplifies the code.
|
|
|
|
|
|
2010-03-29 23:18:48 +00:00
|
|
|
|
(defsubst progress-reporter-update (reporter &optional value)
|
2004-10-09 21:50:57 +00:00
|
|
|
|
"Report progress of an operation in the echo area.
|
2010-03-29 23:18:48 +00:00
|
|
|
|
REPORTER should be the result of a call to `make-progress-reporter'.
|
|
|
|
|
|
|
|
|
|
If REPORTER is a numerical progress reporter---i.e. if it was
|
|
|
|
|
made using non-nil MIN-VALUE and MAX-VALUE arguments to
|
|
|
|
|
`make-progress-reporter'---then VALUE should be a number between
|
|
|
|
|
MIN-VALUE and MAX-VALUE.
|
2004-10-09 21:50:57 +00:00
|
|
|
|
|
2010-03-29 23:18:48 +00:00
|
|
|
|
If REPORTER is a non-numerical reporter, VALUE should be nil.
|
2004-10-08 17:23:40 +00:00
|
|
|
|
|
2010-03-29 23:18:48 +00:00
|
|
|
|
This function is relatively inexpensive. If the change since
|
|
|
|
|
last update is too small or insufficient time has passed, it does
|
|
|
|
|
nothing."
|
|
|
|
|
(when (or (not (numberp value)) ; For pulsing reporter
|
|
|
|
|
(>= value (car reporter))) ; For numerical reporter
|
|
|
|
|
(progress-reporter-do-update reporter value)))
|
|
|
|
|
|
|
|
|
|
(defun make-progress-reporter (message &optional min-value max-value
|
|
|
|
|
current-value min-change min-time)
|
|
|
|
|
"Return progress reporter object for use with `progress-reporter-update'.
|
|
|
|
|
|
|
|
|
|
MESSAGE is shown in the echo area, with a status indicator
|
|
|
|
|
appended to the end. When you call `progress-reporter-done', the
|
|
|
|
|
word \"done\" is printed after the MESSAGE. You can change the
|
|
|
|
|
MESSAGE of an existing progress reporter by calling
|
|
|
|
|
`progress-reporter-force-update'.
|
|
|
|
|
|
|
|
|
|
MIN-VALUE and MAX-VALUE, if non-nil, are starting (0% complete)
|
|
|
|
|
and final (100% complete) states of operation; the latter should
|
|
|
|
|
be larger. In this case, the status message shows the percentage
|
|
|
|
|
progress.
|
|
|
|
|
|
|
|
|
|
If MIN-VALUE and/or MAX-VALUE is omitted or nil, the status
|
|
|
|
|
message shows a \"spinning\", non-numeric indicator.
|
|
|
|
|
|
|
|
|
|
Optional CURRENT-VALUE is the initial progress; the default is
|
|
|
|
|
MIN-VALUE.
|
|
|
|
|
Optional MIN-CHANGE is the minimal change in percents to report;
|
|
|
|
|
the default is 1%.
|
|
|
|
|
CURRENT-VALUE and MIN-CHANGE do not have any effect if MIN-VALUE
|
|
|
|
|
and/or MAX-VALUE are nil.
|
|
|
|
|
|
|
|
|
|
Optional MIN-TIME specifies the minimum interval time between
|
|
|
|
|
echo area updates (default is 0.2 seconds.) If the function
|
|
|
|
|
`float-time' is not present, time is not tracked at all. If the
|
|
|
|
|
OS is not capable of measuring fractions of seconds, this
|
|
|
|
|
parameter is effectively rounded up."
|
2011-06-02 18:04:44 +00:00
|
|
|
|
(when (string-match "[[:alnum:]]\\'" message)
|
|
|
|
|
(setq message (concat message "...")))
|
2004-10-08 17:23:40 +00:00
|
|
|
|
(unless min-time
|
|
|
|
|
(setq min-time 0.2))
|
|
|
|
|
(let ((reporter
|
2010-03-29 23:18:48 +00:00
|
|
|
|
;; Force a call to `message' now
|
|
|
|
|
(cons (or min-value 0)
|
2004-10-08 17:23:40 +00:00
|
|
|
|
(vector (if (and (fboundp 'float-time)
|
|
|
|
|
(>= min-time 0.02))
|
|
|
|
|
(float-time) nil)
|
|
|
|
|
min-value
|
|
|
|
|
max-value
|
|
|
|
|
message
|
|
|
|
|
(if min-change (max (min min-change 50) 1) 1)
|
|
|
|
|
min-time))))
|
|
|
|
|
(progress-reporter-update reporter (or current-value min-value))
|
|
|
|
|
reporter))
|
|
|
|
|
|
2010-03-29 23:18:48 +00:00
|
|
|
|
(defun progress-reporter-force-update (reporter &optional value new-message)
|
2004-10-08 17:23:40 +00:00
|
|
|
|
"Report progress of an operation in the echo area unconditionally.
|
|
|
|
|
|
2010-03-29 23:18:48 +00:00
|
|
|
|
The first two arguments are the same as in `progress-reporter-update'.
|
|
|
|
|
NEW-MESSAGE, if non-nil, sets a new message for the reporter."
|
2004-10-08 17:23:40 +00:00
|
|
|
|
(let ((parameters (cdr reporter)))
|
|
|
|
|
(when new-message
|
|
|
|
|
(aset parameters 3 new-message))
|
|
|
|
|
(when (aref parameters 0)
|
|
|
|
|
(aset parameters 0 (float-time)))
|
|
|
|
|
(progress-reporter-do-update reporter value)))
|
|
|
|
|
|
2010-03-29 23:18:48 +00:00
|
|
|
|
(defvar progress-reporter--pulse-characters ["-" "\\" "|" "/"]
|
|
|
|
|
"Characters to use for pulsing progress reporters.")
|
|
|
|
|
|
2004-10-08 17:23:40 +00:00
|
|
|
|
(defun progress-reporter-do-update (reporter value)
|
|
|
|
|
(let* ((parameters (cdr reporter))
|
2010-03-29 23:18:48 +00:00
|
|
|
|
(update-time (aref parameters 0))
|
2004-10-08 17:23:40 +00:00
|
|
|
|
(min-value (aref parameters 1))
|
|
|
|
|
(max-value (aref parameters 2))
|
2010-03-29 23:18:48 +00:00
|
|
|
|
(text (aref parameters 3))
|
2004-10-08 17:23:40 +00:00
|
|
|
|
(current-time (float-time))
|
|
|
|
|
(enough-time-passed
|
|
|
|
|
;; See if enough time has passed since the last update.
|
|
|
|
|
(or (not update-time)
|
|
|
|
|
(when (>= current-time update-time)
|
|
|
|
|
;; Calculate time for the next update
|
|
|
|
|
(aset parameters 0 (+ update-time (aref parameters 5)))))))
|
2010-03-29 23:18:48 +00:00
|
|
|
|
(cond ((and min-value max-value)
|
|
|
|
|
;; Numerical indicator
|
|
|
|
|
(let* ((one-percent (/ (- max-value min-value) 100.0))
|
|
|
|
|
(percentage (if (= max-value min-value)
|
|
|
|
|
0
|
|
|
|
|
(truncate (/ (- value min-value)
|
|
|
|
|
one-percent)))))
|
|
|
|
|
;; Calculate NEXT-UPDATE-VALUE. If we are not printing
|
|
|
|
|
;; message because not enough time has passed, use 1
|
|
|
|
|
;; instead of MIN-CHANGE. This makes delays between echo
|
|
|
|
|
;; area updates closer to MIN-TIME.
|
|
|
|
|
(setcar reporter
|
|
|
|
|
(min (+ min-value (* (+ percentage
|
|
|
|
|
(if enough-time-passed
|
|
|
|
|
;; MIN-CHANGE
|
|
|
|
|
(aref parameters 4)
|
|
|
|
|
1))
|
|
|
|
|
one-percent))
|
|
|
|
|
max-value))
|
|
|
|
|
(when (integerp value)
|
|
|
|
|
(setcar reporter (ceiling (car reporter))))
|
|
|
|
|
;; Only print message if enough time has passed
|
|
|
|
|
(when enough-time-passed
|
|
|
|
|
(if (> percentage 0)
|
|
|
|
|
(message "%s%d%%" text percentage)
|
|
|
|
|
(message "%s" text)))))
|
|
|
|
|
;; Pulsing indicator
|
|
|
|
|
(enough-time-passed
|
|
|
|
|
(let ((index (mod (1+ (car reporter)) 4))
|
|
|
|
|
(message-log-max nil))
|
|
|
|
|
(setcar reporter index)
|
|
|
|
|
(message "%s %s"
|
|
|
|
|
text
|
|
|
|
|
(aref progress-reporter--pulse-characters
|
|
|
|
|
index)))))))
|
2004-10-08 17:23:40 +00:00
|
|
|
|
|
|
|
|
|
(defun progress-reporter-done (reporter)
|
|
|
|
|
"Print reporter's message followed by word \"done\" in echo area."
|
|
|
|
|
(message "%sdone" (aref (cdr reporter) 3)))
|
|
|
|
|
|
2005-01-19 23:44:48 +00:00
|
|
|
|
(defmacro dotimes-with-progress-reporter (spec message &rest body)
|
|
|
|
|
"Loop a certain number of times and report progress in the echo area.
|
|
|
|
|
Evaluate BODY with VAR bound to successive integers running from
|
|
|
|
|
0, inclusive, to COUNT, exclusive. Then evaluate RESULT to get
|
|
|
|
|
the return value (nil if RESULT is omitted).
|
|
|
|
|
|
|
|
|
|
At each iteration MESSAGE followed by progress percentage is
|
|
|
|
|
printed in the echo area. After the loop is finished, MESSAGE
|
|
|
|
|
followed by word \"done\" is printed. This macro is a
|
|
|
|
|
convenience wrapper around `make-progress-reporter' and friends.
|
|
|
|
|
|
|
|
|
|
\(fn (VAR COUNT [RESULT]) MESSAGE BODY...)"
|
|
|
|
|
(declare (indent 2) (debug ((symbolp form &optional form) form body)))
|
|
|
|
|
(let ((temp (make-symbol "--dotimes-temp--"))
|
|
|
|
|
(temp2 (make-symbol "--dotimes-temp2--"))
|
|
|
|
|
(start 0)
|
|
|
|
|
(end (nth 1 spec)))
|
|
|
|
|
`(let ((,temp ,end)
|
|
|
|
|
(,(car spec) ,start)
|
|
|
|
|
(,temp2 (make-progress-reporter ,message ,start ,end)))
|
|
|
|
|
(while (< ,(car spec) ,temp)
|
|
|
|
|
,@body
|
|
|
|
|
(progress-reporter-update ,temp2
|
|
|
|
|
(setq ,(car spec) (1+ ,(car spec)))))
|
|
|
|
|
(progress-reporter-done ,temp2)
|
|
|
|
|
nil ,@(cdr (cdr spec)))))
|
2005-08-26 12:31:55 +00:00
|
|
|
|
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2005-10-22 15:01:08 +00:00
|
|
|
|
;;;; Comparing version strings.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2009-11-11 06:36:41 +00:00
|
|
|
|
(defconst version-separator "."
|
2010-11-02 01:50:22 +00:00
|
|
|
|
"Specify the string used to separate the version elements.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
Usually the separator is \".\", but it can be any other string.")
|
|
|
|
|
|
|
|
|
|
|
2009-11-11 06:36:41 +00:00
|
|
|
|
(defconst version-regexp-alist
|
2013-11-14 17:07:03 +00:00
|
|
|
|
'(("^[-_+ ]?snapshot$" . -4)
|
|
|
|
|
;; treat "1.2.3-20050920" and "1.2-3" as snapshot releases
|
|
|
|
|
("^[-_+]$" . -4)
|
|
|
|
|
;; treat "1.2.3-CVS" as snapshot release
|
|
|
|
|
("^[-_+ ]?\\(cvs\\|git\\|bzr\\|svn\\|hg\\|darcs\\)$" . -4)
|
|
|
|
|
("^[-_+ ]?alpha$" . -3)
|
|
|
|
|
("^[-_+ ]?beta$" . -2)
|
2013-11-15 10:02:13 +00:00
|
|
|
|
("^[-_+ ]?\\(pre\\|rc\\)$" . -1))
|
2010-11-02 01:50:22 +00:00
|
|
|
|
"Specify association between non-numeric version and its priority.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
This association is used to handle version string like \"1.0pre2\",
|
|
|
|
|
\"0.9alpha1\", etc. It's used by `version-to-list' (which see) to convert the
|
2010-03-27 12:31:04 +00:00
|
|
|
|
non-numeric part of a version string to an integer. For example:
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
String Version Integer List Version
|
2013-11-02 09:48:11 +00:00
|
|
|
|
\"0.9snapshot\" (0 9 -4)
|
|
|
|
|
\"1.0-git\" (1 0 -4)
|
2005-08-25 01:37:47 +00:00
|
|
|
|
\"1.0pre2\" (1 0 -1 2)
|
|
|
|
|
\"1.0PRE2\" (1 0 -1 2)
|
|
|
|
|
\"22.8beta3\" (22 8 -2 3)
|
2005-12-12 14:23:06 +00:00
|
|
|
|
\"22.8 Beta3\" (22 8 -2 3)
|
2005-08-25 01:37:47 +00:00
|
|
|
|
\"0.9alpha1\" (0 9 -3 1)
|
|
|
|
|
\"0.9AlphA1\" (0 9 -3 1)
|
2005-12-12 14:23:06 +00:00
|
|
|
|
\"0.9 alpha\" (0 9 -3)
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
Each element has the following form:
|
|
|
|
|
|
|
|
|
|
(REGEXP . PRIORITY)
|
|
|
|
|
|
|
|
|
|
Where:
|
|
|
|
|
|
|
|
|
|
REGEXP regexp used to match non-numeric part of a version string.
|
2010-03-27 12:31:04 +00:00
|
|
|
|
It should begin with the `^' anchor and end with a `$' to
|
2005-09-24 10:41:18 +00:00
|
|
|
|
prevent false hits. Letter-case is ignored while matching
|
|
|
|
|
REGEXP.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2010-03-27 12:31:04 +00:00
|
|
|
|
PRIORITY a negative integer specifying non-numeric priority of REGEXP.")
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun version-to-list (ver)
|
2010-03-27 12:31:04 +00:00
|
|
|
|
"Convert version string VER into a list of integers.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
The version syntax is given by the following EBNF:
|
|
|
|
|
|
|
|
|
|
VERSION ::= NUMBER ( SEPARATOR NUMBER )*.
|
|
|
|
|
|
|
|
|
|
NUMBER ::= (0|1|2|3|4|5|6|7|8|9)+.
|
|
|
|
|
|
|
|
|
|
SEPARATOR ::= `version-separator' (which see)
|
|
|
|
|
| `version-regexp-alist' (which see).
|
|
|
|
|
|
2005-09-24 10:41:18 +00:00
|
|
|
|
The NUMBER part is optional if SEPARATOR is a match for an element
|
|
|
|
|
in `version-regexp-alist'.
|
|
|
|
|
|
2010-03-27 12:31:04 +00:00
|
|
|
|
Examples of valid version syntax:
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2005-09-24 10:41:18 +00:00
|
|
|
|
1.0pre2 1.0.7.5 22.8beta3 0.9alpha1 6.9.30Beta
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2010-03-27 12:31:04 +00:00
|
|
|
|
Examples of invalid version syntax:
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
1.0prepre2 1.0..7.5 22.8X3 alpha3.2 .5
|
|
|
|
|
|
2010-03-27 12:31:04 +00:00
|
|
|
|
Examples of version conversion:
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2010-03-27 12:31:04 +00:00
|
|
|
|
Version String Version as a List of Integers
|
2005-08-25 01:37:47 +00:00
|
|
|
|
\"1.0.7.5\" (1 0 7 5)
|
|
|
|
|
\"1.0pre2\" (1 0 -1 2)
|
|
|
|
|
\"1.0PRE2\" (1 0 -1 2)
|
|
|
|
|
\"22.8beta3\" (22 8 -2 3)
|
|
|
|
|
\"22.8Beta3\" (22 8 -2 3)
|
|
|
|
|
\"0.9alpha1\" (0 9 -3 1)
|
|
|
|
|
\"0.9AlphA1\" (0 9 -3 1)
|
|
|
|
|
\"0.9alpha\" (0 9 -3)
|
2013-11-02 09:48:11 +00:00
|
|
|
|
\"0.9snapshot\" (0 9 -4)
|
|
|
|
|
\"1.0-git\" (1 0 -4)
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
See documentation for `version-separator' and `version-regexp-alist'."
|
2005-12-12 14:23:06 +00:00
|
|
|
|
(or (and (stringp ver) (> (length ver) 0))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
(error "Invalid version string: '%s'" ver))
|
2005-12-12 14:23:06 +00:00
|
|
|
|
;; Change .x.y to 0.x.y
|
|
|
|
|
(if (and (>= (length ver) (length version-separator))
|
|
|
|
|
(string-equal (substring ver 0 (length version-separator))
|
2007-04-09 23:10:00 +00:00
|
|
|
|
version-separator))
|
2005-12-12 14:23:06 +00:00
|
|
|
|
(setq ver (concat "0" ver)))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
(save-match-data
|
|
|
|
|
(let ((i 0)
|
2005-09-24 10:41:18 +00:00
|
|
|
|
(case-fold-search t) ; ignore case in matching
|
2005-08-25 01:37:47 +00:00
|
|
|
|
lst s al)
|
|
|
|
|
(while (and (setq s (string-match "[0-9]+" ver i))
|
|
|
|
|
(= s i))
|
|
|
|
|
;; handle numeric part
|
|
|
|
|
(setq lst (cons (string-to-number (substring ver i (match-end 0)))
|
|
|
|
|
lst)
|
|
|
|
|
i (match-end 0))
|
|
|
|
|
;; handle non-numeric part
|
|
|
|
|
(when (and (setq s (string-match "[^0-9]+" ver i))
|
|
|
|
|
(= s i))
|
|
|
|
|
(setq s (substring ver i (match-end 0))
|
|
|
|
|
i (match-end 0))
|
|
|
|
|
;; handle alpha, beta, pre, etc. separator
|
|
|
|
|
(unless (string= s version-separator)
|
|
|
|
|
(setq al version-regexp-alist)
|
|
|
|
|
(while (and al (not (string-match (caar al) s)))
|
|
|
|
|
(setq al (cdr al)))
|
2010-08-29 01:31:45 +00:00
|
|
|
|
(cond (al
|
|
|
|
|
(push (cdar al) lst))
|
2010-11-02 01:50:22 +00:00
|
|
|
|
;; Convert 22.3a to 22.3.1, 22.3b to 22.3.2, etc.
|
2010-08-29 01:31:45 +00:00
|
|
|
|
((string-match "^[-_+ ]?\\([a-zA-Z]\\)$" s)
|
|
|
|
|
(push (- (aref (downcase (match-string 1 s)) 0) ?a -1)
|
|
|
|
|
lst))
|
|
|
|
|
(t (error "Invalid version syntax: '%s'" ver))))))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
(if (null lst)
|
|
|
|
|
(error "Invalid version syntax: '%s'" ver)
|
|
|
|
|
(nreverse lst)))))
|
|
|
|
|
|
|
|
|
|
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(defun version-list-< (l1 l2)
|
2010-03-27 12:31:04 +00:00
|
|
|
|
"Return t if L1, a list specification of a version, is lower than L2.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2010-03-27 12:31:04 +00:00
|
|
|
|
Note that a version specified by the list (1) is equal to (1 0),
|
|
|
|
|
\(1 0 0), (1 0 0 0), etc. That is, the trailing zeros are insignificant.
|
|
|
|
|
Also, a version given by the list (1) is higher than (1 -1), which in
|
|
|
|
|
turn is higher than (1 -2), which is higher than (1 -3)."
|
2005-08-25 01:37:47 +00:00
|
|
|
|
(while (and l1 l2 (= (car l1) (car l2)))
|
|
|
|
|
(setq l1 (cdr l1)
|
|
|
|
|
l2 (cdr l2)))
|
|
|
|
|
(cond
|
|
|
|
|
;; l1 not null and l2 not null
|
|
|
|
|
((and l1 l2) (< (car l1) (car l2)))
|
|
|
|
|
;; l1 null and l2 null ==> l1 length = l2 length
|
|
|
|
|
((and (null l1) (null l2)) nil)
|
|
|
|
|
;; l1 not null and l2 null ==> l1 length > l2 length
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(l1 (< (version-list-not-zero l1) 0))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
;; l1 null and l2 not null ==> l2 length > l1 length
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(t (< 0 (version-list-not-zero l2)))))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(defun version-list-= (l1 l2)
|
2010-03-27 12:31:04 +00:00
|
|
|
|
"Return t if L1, a list specification of a version, is equal to L2.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2010-03-27 12:31:04 +00:00
|
|
|
|
Note that a version specified by the list (1) is equal to (1 0),
|
|
|
|
|
\(1 0 0), (1 0 0 0), etc. That is, the trailing zeros are insignificant.
|
|
|
|
|
Also, a version given by the list (1) is higher than (1 -1), which in
|
|
|
|
|
turn is higher than (1 -2), which is higher than (1 -3)."
|
2005-08-25 01:37:47 +00:00
|
|
|
|
(while (and l1 l2 (= (car l1) (car l2)))
|
|
|
|
|
(setq l1 (cdr l1)
|
|
|
|
|
l2 (cdr l2)))
|
|
|
|
|
(cond
|
|
|
|
|
;; l1 not null and l2 not null
|
|
|
|
|
((and l1 l2) nil)
|
|
|
|
|
;; l1 null and l2 null ==> l1 length = l2 length
|
|
|
|
|
((and (null l1) (null l2)))
|
|
|
|
|
;; l1 not null and l2 null ==> l1 length > l2 length
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(l1 (zerop (version-list-not-zero l1)))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
;; l1 null and l2 not null ==> l2 length > l1 length
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(t (zerop (version-list-not-zero l2)))))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(defun version-list-<= (l1 l2)
|
2010-03-27 12:31:04 +00:00
|
|
|
|
"Return t if L1, a list specification of a version, is lower or equal to L2.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
Note that integer list (1) is equal to (1 0), (1 0 0), (1 0 0 0),
|
2010-11-02 01:50:22 +00:00
|
|
|
|
etc. That is, the trailing zeroes are insignificant. Also, integer
|
2005-08-25 01:37:47 +00:00
|
|
|
|
list (1) is greater than (1 -1) which is greater than (1 -2)
|
|
|
|
|
which is greater than (1 -3)."
|
|
|
|
|
(while (and l1 l2 (= (car l1) (car l2)))
|
|
|
|
|
(setq l1 (cdr l1)
|
|
|
|
|
l2 (cdr l2)))
|
|
|
|
|
(cond
|
|
|
|
|
;; l1 not null and l2 not null
|
|
|
|
|
((and l1 l2) (< (car l1) (car l2)))
|
|
|
|
|
;; l1 null and l2 null ==> l1 length = l2 length
|
|
|
|
|
((and (null l1) (null l2)))
|
|
|
|
|
;; l1 not null and l2 null ==> l1 length > l2 length
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(l1 (<= (version-list-not-zero l1) 0))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
;; l1 null and l2 not null ==> l2 length > l1 length
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(t (<= 0 (version-list-not-zero l2)))))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(defun version-list-not-zero (lst)
|
2010-03-27 12:31:04 +00:00
|
|
|
|
"Return the first non-zero element of LST, which is a list of integers.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2010-03-27 12:31:04 +00:00
|
|
|
|
If all LST elements are zeros or LST is nil, return zero."
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(while (and lst (zerop (car lst)))
|
|
|
|
|
(setq lst (cdr lst)))
|
|
|
|
|
(if lst
|
|
|
|
|
(car lst)
|
|
|
|
|
;; there is no element different of zero
|
|
|
|
|
0))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun version< (v1 v2)
|
2010-03-27 12:31:04 +00:00
|
|
|
|
"Return t if version V1 is lower (older) than V2.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
|
2010-03-27 12:31:04 +00:00
|
|
|
|
etc. That is, the trailing \".0\"s are insignificant. Also, version
|
|
|
|
|
string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
|
2013-11-04 14:09:36 +00:00
|
|
|
|
which is higher than \"1alpha\", which is higher than \"1snapshot\".
|
|
|
|
|
Also, \"-GIT\", \"-CVS\" and \"-NNN\" are treated as snapshot versions."
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(version-list-< (version-to-list v1) (version-to-list v2)))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
(defun version<= (v1 v2)
|
2010-03-27 12:31:04 +00:00
|
|
|
|
"Return t if version V1 is lower (older) than or equal to V2.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
|
|
|
|
Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
|
2010-11-02 01:50:22 +00:00
|
|
|
|
etc. That is, the trailing \".0\"s are insignificant. Also, version
|
2010-03-27 12:31:04 +00:00
|
|
|
|
string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
|
2013-11-04 14:09:36 +00:00
|
|
|
|
which is higher than \"1alpha\", which is higher than \"1snapshot\".
|
|
|
|
|
Also, \"-GIT\", \"-CVS\" and \"-NNN\" are treated as snapshot versions."
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(version-list-<= (version-to-list v1) (version-to-list v2)))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(defun version= (v1 v2)
|
|
|
|
|
"Return t if version V1 is equal to V2.
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2005-08-26 12:31:55 +00:00
|
|
|
|
Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
|
2010-11-02 01:50:22 +00:00
|
|
|
|
etc. That is, the trailing \".0\"s are insignificant. Also, version
|
2010-03-27 12:31:04 +00:00
|
|
|
|
string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
|
2013-11-04 14:09:36 +00:00
|
|
|
|
which is higher than \"1alpha\", which is higher than \"1snapshot\".
|
|
|
|
|
Also, \"-GIT\", \"-CVS\" and \"-NNN\" are treated as snapshot versions."
|
2005-08-26 12:31:55 +00:00
|
|
|
|
(version-list-= (version-to-list v1) (version-to-list v2)))
|
2005-08-25 01:37:47 +00:00
|
|
|
|
|
2009-08-09 02:57:45 +00:00
|
|
|
|
|
|
|
|
|
;;; Misc.
|
2009-11-11 05:57:51 +00:00
|
|
|
|
(defconst menu-bar-separator '("--")
|
|
|
|
|
"Separator for menus.")
|
2009-08-09 02:57:45 +00:00
|
|
|
|
|
|
|
|
|
;; The following statement ought to be in print.c, but `provide' can't
|
|
|
|
|
;; be used there.
|
2010-12-11 02:34:55 +00:00
|
|
|
|
;; http://lists.gnu.org/archive/html/emacs-devel/2009-08/msg00236.html
|
2009-08-09 02:57:45 +00:00
|
|
|
|
(when (hash-table-p (car (read-from-string
|
|
|
|
|
(prin1-to-string (make-hash-table)))))
|
|
|
|
|
(provide 'hashtable-print-readable))
|
|
|
|
|
|
2013-05-16 10:14:30 +00:00
|
|
|
|
;; This is used in lisp/Makefile.in and in leim/Makefile.in to
|
|
|
|
|
;; generate file names for autoloads, custom-deps, and finder-data.
|
2013-05-25 16:05:19 +00:00
|
|
|
|
(defun unmsys--file-name (file)
|
2013-05-25 07:19:50 +00:00
|
|
|
|
"Produce the canonical file name for FILE from its MSYS form.
|
2013-04-19 08:42:34 +00:00
|
|
|
|
|
|
|
|
|
On systems other than MS-Windows, just returns FILE.
|
|
|
|
|
On MS-Windows, converts /d/foo/bar form of file names
|
|
|
|
|
passed by MSYS Make into d:/foo/bar that Emacs can grok.
|
|
|
|
|
|
2013-05-25 07:19:50 +00:00
|
|
|
|
This function is called from lisp/Makefile and leim/Makefile."
|
2013-04-19 08:42:34 +00:00
|
|
|
|
(when (and (eq system-type 'windows-nt)
|
|
|
|
|
(string-match "\\`/[a-zA-Z]/" file))
|
|
|
|
|
(setq file (concat (substring file 1 2) ":" (substring file 2))))
|
|
|
|
|
file)
|
|
|
|
|
|
|
|
|
|
|
1992-07-15 21:31:44 +00:00
|
|
|
|
;;; subr.el ends here
|