HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(create-fontset-from-fontset-spec): Fix
[bpt/emacs.git]
/
lisp
/
edmacro.el
diff --git
a/lisp/edmacro.el
b/lisp/edmacro.el
index
09872f3
..
3d4a58d
100644
(file)
--- a/
lisp/edmacro.el
+++ b/
lisp/edmacro.el
@@
-1,6
+1,7
@@
;;; edmacro.el --- keyboard macro editor
;;; edmacro.el --- keyboard macro editor
-;; Copyright (C) 1993, 1994, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Maintainer: Dave Gillespie <daveg@synaptics.com>
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Maintainer: Dave Gillespie <daveg@synaptics.com>
@@
-21,8
+22,8
@@
;; 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
;; 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., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Commentary:
;;; Commentary:
@@
-280,7
+281,7
@@
or nil, use a compact 80-column format."
(let ((str (buffer-substring (match-beginning 1)
(match-end 1))))
(unless (equal str "")
(let ((str (buffer-substring (match-beginning 1)
(match-end 1))))
(unless (equal str "")
- (setq mac-counter (string-to-
int
str))))
+ (setq mac-counter (string-to-
number
str))))
t)
((looking-at "Format:[ \t]*\"\\([^\n]*\\)\"[ \t]*$")
(when edmacro-store-hook
t)
((looking-at "Format:[ \t]*\"\\([^\n]*\\)\"[ \t]*$")
(when edmacro-store-hook
@@
-698,7
+699,7
@@
This function assumes that the events can be stored in a string."
(times 1))
(setq pos (match-end 0))
(when (string-match "\\([0-9]+\\)\\*." word)
(times 1))
(setq pos (match-end 0))
(when (string-match "\\([0-9]+\\)\\*." word)
- (setq times (string-to-
int
(substring word 0 (match-end 1))))
+ (setq times (string-to-
number
(substring word 0 (match-end 1))))
(setq word (substring word (1+ (match-end 1)))))
(cond ((string-match "^<<.+>>$" word)
(setq key (vconcat (if (eq (key-binding [?\M-x])
(setq word (substring word (1+ (match-end 1)))))
(cond ((string-match "^<<.+>>$" word)
(setq key (vconcat (if (eq (key-binding [?\M-x])