;;; macros.el --- non-primitive commands for keyboard macros
-;; Copyright (C) 1985, 86, 87, 92, 94, 95 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2016 Free Software
+;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
;; Keywords: abbrev
+;; Package: emacs
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
Such a \"function\" cannot be called from Lisp, but it is a valid editor command."
(interactive "SName for last kbd macro: ")
(or last-kbd-macro
- (error "No keyboard macro defined"))
+ (user-error "No keyboard macro defined"))
(and (fboundp symbol)
(not (stringp (symbol-function symbol)))
(not (vectorp (symbol-function symbol)))
- (error "Function %s is already defined and not a keyboard macro"
+ (user-error "Function %s is already defined and not a keyboard macro"
symbol))
(if (string-equal symbol "")
- (error "No command name given"))
+ (user-error "No command name given"))
(fset symbol last-kbd-macro))
;;;###autoload
(defun insert-kbd-macro (macroname &optional keys)
- "Insert in buffer the definition of kbd macro NAME, as Lisp code.
+ "Insert in buffer the definition of kbd macro MACRONAME, as Lisp code.
+MACRONAME should be a symbol.
Optional second arg KEYS means also record the keys it is on
\(this is the prefix argument, when calling interactively).
To save a kbd macro, visit a file of Lisp code such as your `~/.emacs',
use this command, and then save the file."
- (interactive "CInsert kbd macro (name): \nP")
+ (interactive (list (intern (completing-read "Insert kbd macro (name): "
+ obarray
+ (lambda (elt)
+ (and (fboundp elt)
+ (or (stringp (symbol-function elt))
+ (vectorp (symbol-function elt))
+ (get elt 'kmacro))))
+ t))
+ current-prefix-arg))
(let (definition)
(if (string= (symbol-name macroname) "")
(progn
(delete-region (point) (1+ (point)))
(insert "\\M-\\C-?"))))))
(if (vectorp definition)
- (let ((len (length definition)) (i 0) char mods)
+ (let ((len (length definition)) (i 0) char)
(while (< i len)
- (insert (if (zerop i) ?\[ ?\ ))
+ (insert (if (zerop i) ?\[ ?\s))
(setq char (aref definition i)
i (1+ i))
- (cond ((not (numberp char))
- (prin1 char (current-buffer)))
- (t
- (insert "?")
- (setq mods (event-modifiers char)
- char (event-basic-type char))
- (while mods
- (cond ((eq (car mods) 'control)
- (insert "\\C-"))
- ((eq (car mods) 'meta)
- (insert "\\M-"))
- ((eq (car mods) 'hyper)
- (insert "\\H-"))
- ((eq (car mods) 'super)
- (insert "\\s-"))
- ((eq (car mods) 'alt)
- (insert "\\A-"))
- ((and (eq (car mods) 'shift)
- (>= char ?a)
- (<= char ?z))
- (setq char (upcase char)))
- ((eq (car mods) 'shift)
- (insert "\\S-")))
- (setq mods (cdr mods)))
- (cond ((= char ?\\)
- (insert "\\\\"))
- ((= char ?\;)
- (insert "\\;"))
- ((= char 127)
- (insert "\\C-?"))
- ((< char 127)
- (insert char))
- (t (insert "\\" (format "%o" char)))))))
+ (if (not (numberp char))
+ (prin1 char (current-buffer))
+ (princ (prin1-char char) (current-buffer))))
(insert ?\]))
(prin1 definition (current-buffer))))
(insert ")\n")
(if keys
- (let ((keys (where-is-internal macroname '(keymap))))
+ (let ((keys (where-is-internal (symbol-function macroname)
+ '(keymap))))
(while keys
(insert "(global-set-key ")
(prin1 (car keys) (current-buffer))
(interactive "P")
(or executing-kbd-macro
defining-kbd-macro
- (error "Not defining or executing kbd macro"))
+ (user-error "Not defining or executing kbd macro"))
(if flag
(let (executing-kbd-macro defining-kbd-macro)
(recursive-edit))
\\[exit] Stop the macro entirely right now.
\\[recenter] Redisplay the screen, then ask again.
\\[edit] Enter recursive edit; ask again when you exit from that."))
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(help-mode)))))))))))
;;;###autoload
(defun apply-macro-to-region-lines (top bottom &optional macro)
- "For each complete line between point and mark, move to the beginning
-of the line, and run the last keyboard macro.
+ "Apply last keyboard macro to all lines in the region.
+For each line that begins in the region, move to the beginning of
+the line, and run the last keyboard macro.
When called from lisp, this function takes two arguments TOP and
BOTTOM, describing the current region. TOP must be before BOTTOM.
Suppose you wanted to build a keyword table in C where each entry
looked like this:
- { \"foo\", foo_data, foo_function },
+ { \"foo\", foo_data, foo_function },
{ \"bar\", bar_data, bar_function },
{ \"baz\", baz_data, baz_function },
\\C-x )
and then select the region of un-tablified names and use
-`\\[apply-macro-to-region-lines]' to build the table from the names.
-"
+`\\[apply-macro-to-region-lines]' to build the table from the names."
(interactive "r")
(or macro
(progn
(if (null last-kbd-macro)
- (error "No keyboard macro has been defined"))
+ (user-error "No keyboard macro has been defined"))
(setq macro last-kbd-macro)))
(save-excursion
- (let ((end-marker (progn
- (goto-char bottom)
- (beginning-of-line)
- (point-marker)))
+ (let ((end-marker (copy-marker bottom))
next-line-marker)
(goto-char top)
(if (not (bolp))
(set-marker next-line-marker (point)))
(save-excursion
(let ((mark-active nil))
- (execute-kbd-macro (or macro last-kbd-macro)))))
+ (execute-kbd-macro macro))))
(set-marker end-marker nil)
(set-marker next-line-marker nil))))