Mercurial > emacs
annotate lisp/macros.el @ 110305:b10051866f51
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sat, 11 Sep 2010 01:13:42 +0200 |
parents | 280c8ae2476d |
children | 417b1e4d63cd |
rev | line source |
---|---|
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
33281
diff
changeset
|
1 ;;; macros.el --- non-primitive commands for keyboard macros |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
427
diff
changeset
|
2 |
74442 | 3 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2001, 2002, 2003, |
106815 | 4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
845 | 5 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
6 ;; Maintainer: FSF |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1470
diff
changeset
|
7 ;; Keywords: abbrev |
110015
280c8ae2476d
Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents:
107332
diff
changeset
|
8 ;; Package: emacs |
36 | 9 |
10 ;; This file is part of GNU Emacs. | |
11 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
36 | 13 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
15 ;; (at your option) any later version. |
36 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
36 | 24 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
25 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
26 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
27 ;; Extension commands for keyboard macros. These permit you to assign |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
28 ;; a name to the last-defined keyboard macro, expand and insert the |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
29 ;; lisp corresponding to a macro, query the user from within a macro, |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
30 ;; or apply a macro to each line in the reason. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
31 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
32 ;;; Code: |
36 | 33 |
256 | 34 ;;;###autoload |
36 | 35 (defun name-last-kbd-macro (symbol) |
36 "Assign a name to the last keyboard macro defined. | |
216 | 37 Argument SYMBOL is the name to define. |
36 | 38 The symbol's function definition becomes the keyboard macro string. |
217
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
39 Such a \"function\" cannot be called from Lisp, but it is a valid editor command." |
36 | 40 (interactive "SName for last kbd macro: ") |
41 (or last-kbd-macro | |
42 (error "No keyboard macro defined")) | |
43 (and (fboundp symbol) | |
44 (not (stringp (symbol-function symbol))) | |
4331
c75a5c7d4f39
(name-last-kbd-macro): Handle macros that are vectors.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
45 (not (vectorp (symbol-function symbol))) |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
33281
diff
changeset
|
46 (error "Function %s is already defined and not a keyboard macro" |
36 | 47 symbol)) |
14398
ad30f677493e
(name-last-kbd-macro): Reject empty cmd name.
Richard M. Stallman <rms@gnu.org>
parents:
14321
diff
changeset
|
48 (if (string-equal symbol "") |
ad30f677493e
(name-last-kbd-macro): Reject empty cmd name.
Richard M. Stallman <rms@gnu.org>
parents:
14321
diff
changeset
|
49 (error "No command name given")) |
36 | 50 (fset symbol last-kbd-macro)) |
51 | |
256 | 52 ;;;###autoload |
36 | 53 (defun insert-kbd-macro (macroname &optional keys) |
54 "Insert in buffer the definition of kbd macro NAME, as Lisp code. | |
217
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
55 Optional second arg KEYS means also record the keys it is on |
1469
af4fe5e670f2
(insert-kbd-macro): Replace nonprinting chars with escapes.
Richard M. Stallman <rms@gnu.org>
parents:
845
diff
changeset
|
56 \(this is the prefix argument, when calling interactively). |
36 | 57 |
217
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
58 This Lisp code will, when executed, define the kbd macro with the same |
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
59 definition it has now. If you say to record the keys, the Lisp code |
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
60 will also rebind those keys to the macro. Only global key bindings |
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
61 are recorded since executing this Lisp code always makes global |
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
62 bindings. |
36 | 63 |
1469
af4fe5e670f2
(insert-kbd-macro): Replace nonprinting chars with escapes.
Richard M. Stallman <rms@gnu.org>
parents:
845
diff
changeset
|
64 To save a kbd macro, visit a file of Lisp code such as your `~/.emacs', |
36 | 65 use this command, and then save the file." |
58609
d6d7c44e2b68
(insert-kbd-macro): Handle kmacro functions.
Kim F. Storm <storm@cua.dk>
parents:
57969
diff
changeset
|
66 (interactive (list (intern (completing-read "Insert kbd macro (name): " |
d6d7c44e2b68
(insert-kbd-macro): Handle kmacro functions.
Kim F. Storm <storm@cua.dk>
parents:
57969
diff
changeset
|
67 obarray |
57969
e661f2202106
(insert-kbd-macro): Do completions based on macros,
Eli Zaretskii <eliz@gnu.org>
parents:
56857
diff
changeset
|
68 (lambda (elt) |
e661f2202106
(insert-kbd-macro): Do completions based on macros,
Eli Zaretskii <eliz@gnu.org>
parents:
56857
diff
changeset
|
69 (and (fboundp elt) |
e661f2202106
(insert-kbd-macro): Do completions based on macros,
Eli Zaretskii <eliz@gnu.org>
parents:
56857
diff
changeset
|
70 (or (stringp (symbol-function elt)) |
58609
d6d7c44e2b68
(insert-kbd-macro): Handle kmacro functions.
Kim F. Storm <storm@cua.dk>
parents:
57969
diff
changeset
|
71 (vectorp (symbol-function elt)) |
d6d7c44e2b68
(insert-kbd-macro): Handle kmacro functions.
Kim F. Storm <storm@cua.dk>
parents:
57969
diff
changeset
|
72 (get elt 'kmacro)))) |
57969
e661f2202106
(insert-kbd-macro): Do completions based on macros,
Eli Zaretskii <eliz@gnu.org>
parents:
56857
diff
changeset
|
73 t)) |
e661f2202106
(insert-kbd-macro): Do completions based on macros,
Eli Zaretskii <eliz@gnu.org>
parents:
56857
diff
changeset
|
74 current-prefix-arg)) |
1470
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
75 (let (definition) |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
76 (if (string= (symbol-name macroname) "") |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
77 (progn |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
78 (setq macroname 'last-kbd-macro definition last-kbd-macro) |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
79 (insert "(setq ")) |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
80 (setq definition (symbol-function macroname)) |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
81 (insert "(fset '")) |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
82 (prin1 macroname (current-buffer)) |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
83 (insert "\n ") |
11170
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
84 (if (stringp definition) |
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
85 (let ((beg (point)) end) |
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
86 (prin1 definition (current-buffer)) |
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
87 (setq end (point-marker)) |
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
88 (goto-char beg) |
10153
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
89 (while (< (point) end) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
90 (let ((char (following-char))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
91 (cond ((= char 0) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
92 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
93 (insert "\\C-@")) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
94 ((< char 27) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
95 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
96 (insert "\\C-" (+ 96 char))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
97 ((= char ?\C-\\) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
98 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
99 (insert "\\C-\\\\")) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
100 ((< char 32) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
101 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
102 (insert "\\C-" (+ 64 char))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
103 ((< char 127) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
104 (forward-char 1)) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
105 ((= char 127) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
106 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
107 (insert "\\C-?")) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
108 ((= char 128) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
109 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
110 (insert "\\M-\\C-@")) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
111 ((= char (aref "\M-\C-\\" 0)) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
112 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
113 (insert "\\M-\\C-\\\\")) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
114 ((< char 155) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
115 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
116 (insert "\\M-\\C-" (- char 32))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
117 ((< char 160) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
118 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
119 (insert "\\M-\\C-" (- char 64))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
120 ((= char (aref "\M-\\" 0)) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
121 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
122 (insert "\\M-\\\\")) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
123 ((< char 255) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
124 (delete-region (point) (1+ (point))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
125 (insert "\\M-" (- char 128))) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
126 ((= char 255) |
2279074cd821
(insert-kbd-macro): Specially handle C-\, M-\ and C-M-\.
Richard M. Stallman <rms@gnu.org>
parents:
9851
diff
changeset
|
127 (delete-region (point) (1+ (point))) |
11170
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
128 (insert "\\M-\\C-?")))))) |
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
129 (if (vectorp definition) |
12923
f1e05398634b
(insert-kbd-macro): Express vector char modifiers with
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
130 (let ((len (length definition)) (i 0) char mods) |
11170
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
131 (while (< i len) |
74235
1807458bff39
(insert-kbd-macro): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
132 (insert (if (zerop i) ?\[ ?\s)) |
11170
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
133 (setq char (aref definition i) |
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
134 i (1+ i)) |
95148
97ef76fbfb23
(insert-kbd-macro): Use prin1-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
135 (if (not (numberp char)) |
97ef76fbfb23
(insert-kbd-macro): Use prin1-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
136 (prin1 char (current-buffer)) |
97ef76fbfb23
(insert-kbd-macro): Use prin1-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
137 (princ (prin1-char char) (current-buffer)))) |
11170
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
138 (insert ?\])) |
4d33c7615a5c
(insert-kbd-macro): Do something reasonable for vectors.
Karl Heuer <kwzh@gnu.org>
parents:
10153
diff
changeset
|
139 (prin1 definition (current-buffer)))) |
1470
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
140 (insert ")\n") |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
141 (if keys |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
107082
diff
changeset
|
142 (let ((keys (where-is-internal (symbol-function macroname) |
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
107082
diff
changeset
|
143 '(keymap)))) |
1470
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
144 (while keys |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
145 (insert "(global-set-key ") |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
146 (prin1 (car keys) (current-buffer)) |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
147 (insert " '") |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
148 (prin1 macroname (current-buffer)) |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
149 (insert ")\n") |
eb4043bd65ef
(insert-kbd-macros): If arg is empty, use last macro as default.
Richard M. Stallman <rms@gnu.org>
parents:
1469
diff
changeset
|
150 (setq keys (cdr keys))))))) |
36 | 151 |
256 | 152 ;;;###autoload |
36 | 153 (defun kbd-macro-query (flag) |
154 "Query user during kbd macro execution. | |
217
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
155 With prefix argument, enters recursive edit, reading keyboard |
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
156 commands even within a kbd macro. You can give different commands |
8977ce293397
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
216
diff
changeset
|
157 each time the macro executes. |
2708 | 158 Without prefix argument, asks whether to continue running the macro. |
159 Your options are: \\<query-replace-map> | |
160 \\[act] Finish this iteration normally and continue with the next. | |
161 \\[skip] Skip the rest of this iteration, and start the next. | |
162 \\[exit] Stop the macro entirely right now. | |
163 \\[recenter] Redisplay the screen, then ask again. | |
164 \\[edit] Enter recursive edit; ask again when you exit from that." | |
36 | 165 (interactive "P") |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14398
diff
changeset
|
166 (or executing-kbd-macro |
36 | 167 defining-kbd-macro |
168 (error "Not defining or executing kbd macro")) | |
169 (if flag | |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14398
diff
changeset
|
170 (let (executing-kbd-macro defining-kbd-macro) |
36 | 171 (recursive-edit)) |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14398
diff
changeset
|
172 (if (not executing-kbd-macro) |
36 | 173 nil |
2707
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
174 (let ((loop t) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
175 (msg (substitute-command-keys |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
176 "Proceed with macro?\\<query-replace-map>\ |
2753
c824ba373cc2
(kbd-macro-query): Fix prompt string.
Richard M. Stallman <rms@gnu.org>
parents:
2708
diff
changeset
|
177 (\\[act], \\[skip], \\[exit], \\[recenter], \\[edit]) "))) |
36 | 178 (while loop |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14398
diff
changeset
|
179 (let ((key (let ((executing-kbd-macro nil) |
2707
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
180 (defining-kbd-macro nil)) |
14321
24189cc67176
(kbd-macro-query): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
181 (message "%s" msg) |
2707
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
182 (read-event))) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
183 def) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
184 (setq key (vector key)) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
185 (setq def (lookup-key query-replace-map key)) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
186 (cond ((eq def 'act) |
36 | 187 (setq loop nil)) |
2707
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
188 ((eq def 'skip) |
36 | 189 (setq loop nil) |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14398
diff
changeset
|
190 (setq executing-kbd-macro "")) |
2707
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
191 ((eq def 'exit) |
36 | 192 (setq loop nil) |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14398
diff
changeset
|
193 (setq executing-kbd-macro t)) |
2707
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
194 ((eq def 'recenter) |
36 | 195 (recenter nil)) |
2707
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
196 ((eq def 'edit) |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14398
diff
changeset
|
197 (let (executing-kbd-macro defining-kbd-macro) |
2707
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
198 (recursive-edit))) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
199 ((eq def 'quit) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
200 (setq quit-flag t)) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
201 (t |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
202 (or (eq def 'help) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
203 (ding)) |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
204 (with-output-to-temp-buffer "*Help*" |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
205 (princ |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
206 (substitute-command-keys |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
2753
diff
changeset
|
207 "Specify how to proceed with keyboard macro execution. |
2707
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
208 Possibilities: \\<query-replace-map> |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
209 \\[act] Finish this iteration normally and continue with the next. |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
210 \\[skip] Skip the rest of this iteration, and start the next. |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
211 \\[exit] Stop the macro entirely right now. |
4661157d5c60
(kbd-macro-query): Use query-replace-map to define answers.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
212 \\[recenter] Redisplay the screen, then ask again. |
9851
0e1748cc2f32
(kbd-macro-query): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
213 \\[edit] Enter recursive edit; ask again when you exit from that.")) |
105994
009383a57ce8
* x-dnd.el (x-dnd-maybe-call-test-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100908
diff
changeset
|
214 (with-current-buffer standard-output |
9851
0e1748cc2f32
(kbd-macro-query): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
215 (help-mode))))))))))) |
256 | 216 |
268 | 217 ;;;###autoload |
273 | 218 (defun apply-macro-to-region-lines (top bottom &optional macro) |
56857
be5ab1230982
(apply-macro-to-region-lines): Make it operate on all lines that begin
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
219 "Apply last keyboard macro to all lines in the region. |
be5ab1230982
(apply-macro-to-region-lines): Make it operate on all lines that begin
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
220 For each line that begins in the region, move to the beginning of |
be5ab1230982
(apply-macro-to-region-lines): Make it operate on all lines that begin
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
221 the line, and run the last keyboard macro. |
273 | 222 |
223 When called from lisp, this function takes two arguments TOP and | |
224 BOTTOM, describing the current region. TOP must be before BOTTOM. | |
225 The optional third argument MACRO specifies a keyboard macro to | |
226 execute. | |
227 | |
228 This is useful for quoting or unquoting included text, adding and | |
229 removing comments, or producing tables where the entries are regular. | |
230 | |
231 For example, in Usenet articles, sections of text quoted from another | |
232 author are indented, or have each line start with `>'. To quote a | |
233 section of text, define a keyboard macro which inserts `>', put point | |
234 and mark at opposite ends of the quoted section, and use | |
235 `\\[apply-macro-to-region-lines]' to mark the entire section. | |
236 | |
237 Suppose you wanted to build a keyword table in C where each entry | |
238 looked like this: | |
239 | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47352
diff
changeset
|
240 { \"foo\", foo_data, foo_function }, |
273 | 241 { \"bar\", bar_data, bar_function }, |
242 { \"baz\", baz_data, baz_function }, | |
243 | |
244 You could enter the names in this format: | |
245 | |
246 foo | |
247 bar | |
248 baz | |
249 | |
250 and write a macro to massage a word into a table entry: | |
251 | |
252 \\C-x ( | |
253 \\M-d { \"\\C-y\", \\C-y_data, \\C-y_function }, | |
254 \\C-x ) | |
255 | |
256 and then select the region of un-tablified names and use | |
56857
be5ab1230982
(apply-macro-to-region-lines): Make it operate on all lines that begin
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
257 `\\[apply-macro-to-region-lines]' to build the table from the names." |
273 | 258 (interactive "r") |
391 | 259 (or macro |
260 (progn | |
261 (if (null last-kbd-macro) | |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
33281
diff
changeset
|
262 (error "No keyboard macro has been defined")) |
391 | 263 (setq macro last-kbd-macro))) |
273 | 264 (save-excursion |
56857
be5ab1230982
(apply-macro-to-region-lines): Make it operate on all lines that begin
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
265 (let ((end-marker (copy-marker bottom)) |
427 | 266 next-line-marker) |
273 | 267 (goto-char top) |
268 (if (not (bolp)) | |
269 (forward-line 1)) | |
427 | 270 (setq next-line-marker (point-marker)) |
271 (while (< next-line-marker end-marker) | |
272 (goto-char next-line-marker) | |
274 | 273 (save-excursion |
427 | 274 (forward-line 1) |
275 (set-marker next-line-marker (point))) | |
276 (save-excursion | |
47352
d817d0837c74
(apply-macro-to-region-lines): Let-bind mark-active to
Kim F. Storm <storm@cua.dk>
parents:
38412
diff
changeset
|
277 (let ((mark-active nil)) |
107082 | 278 (execute-kbd-macro macro)))) |
427 | 279 (set-marker end-marker nil) |
280 (set-marker next-line-marker nil)))) | |
273 | 281 |
5307
069c54e77fd1
Don't repeat at load time any bindings that are autoloaded.
Richard M. Stallman <rms@gnu.org>
parents:
4331
diff
changeset
|
282 ;;;###autoload (define-key ctl-x-map "q" 'kbd-macro-query) |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
427
diff
changeset
|
283 |
18383 | 284 (provide 'macros) |
285 | |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
286 ;; arch-tag: 346ed1a5-1220-4bc8-b533-961ee704361f |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
427
diff
changeset
|
287 ;;; macros.el ends here |