1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
# from /usr/local/share/emacs/21.3/etc/PROBLEMS
--- calc-ext.el.~1~ Sun Apr 3 02:26:34 1994
+++ calc-ext.el Wed Sep 18 17:35:01 1996
@@ -1354,6 +1354,25 @@
(calc-fancy-prefix 'calc-inverse-flag "Inverse..." n)
)
+(defconst calc-fancy-prefix-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map [t] 'calc-fancy-prefix-other-key)
+ (define-key map (vector meta-prefix-char t) 'calc-fancy-prefix-other-key)
+ (define-key map [switch-frame] nil)
+ (define-key map [?\C-u] 'universal-argument)
+ (define-key map [?0] 'digit-argument)
+ (define-key map [?1] 'digit-argument)
+ (define-key map [?2] 'digit-argument)
+ (define-key map [?3] 'digit-argument)
+ (define-key map [?4] 'digit-argument)
+ (define-key map [?5] 'digit-argument)
+ (define-key map [?6] 'digit-argument)
+ (define-key map [?7] 'digit-argument)
+ (define-key map [?8] 'digit-argument)
+ (define-key map [?9] 'digit-argument)
+ map)
+ "Keymap used while processing calc-fancy-prefix.")
+
(defun calc-fancy-prefix (flag msg n)
(let (prefix)
(calc-wrapper
@@ -1364,6 +1383,8 @@
(message (if prefix msg "")))
(and prefix
(not calc-is-keypad-press)
+ (if (boundp 'overriding-terminal-local-map)
+ (setq overriding-terminal-local-map calc-fancy-prefix-map)
(let ((event (calc-read-key t)))
(if (eq (setq last-command-char (car event)) ?\C-u)
(universal-argument)
@@ -1376,9 +1397,18 @@
(if (or (not (integerp last-command-char))
(eq last-command-char ?-))
(calc-unread-command)
- (digit-argument n))))))
+ (digit-argument n)))))))
)
(setq calc-is-keypad-press nil)
+
+(defun calc-fancy-prefix-other-key (arg)
+ (interactive "P")
+ (if (or (not (integerp last-command-char))
+ (and (>= last-command-char 0) (< last-command-char ? )
+ (not (eq last-command-char meta-prefix-char))))
+ (calc-wrapper)) ; clear flags if not a Calc command.
+ (calc-unread-command)
+ (setq overriding-terminal-local-map nil))
(defun calc-invert-func ()
(save-excursion
Index: Makefile
--- Makefile.~1~ Sun Dec 15 23:50:45 1996
+++ Makefile Thu Nov 30 15:09:45 2000
@@ -41,7 +41,7 @@
# Other macros.
EFLAGS = -batch
-MAINT = -l calc-maint.elc
+MAINT = -l calc-maint.el
# Control whether intermediate files are kept.
PURGE = -rm -f
@@ -154,10 +154,7 @@
# All this because "-l calc-maint" doesn't work.
-maint: calc-maint.elc
-calc-maint.elc: calc-maint.el
- cp calc-maint.el calc-maint.elc
-
+maint: calc-maint.el
# Create an Emacs TAGS file
tags: TAGS
Index: calc-aent.el
--- calc-aent.el.~1~ Sun Dec 15 23:50:36 1996
+++ calc-aent.el Tue Nov 21 18:34:33 2000
@@ -385,7 +385,7 @@
(calc-minibuffer-contains
"\\`\\([^\"]*\"[^\"]*\"\\)*[^\"]*\"[^\"]*\\'"))
(insert "`")
- (setq alg-exp (buffer-string))
+ (setq alg-exp (field-string))
(and (> (length alg-exp) 0) (setq calc-previous-alg-entry alg-exp))
(exit-minibuffer))
)
@@ -393,14 +393,14 @@
(defun calcAlg-enter ()
(interactive)
- (let* ((str (buffer-string))
+ (let* ((str (field-string))
(exp (and (> (length str) 0)
(save-excursion
(set-buffer calc-buffer)
(math-read-exprs str)))))
(if (eq (car-safe exp) 'error)
(progn
- (goto-char (point-min))
+ (goto-char (field-beginning))
(forward-char (nth 1 exp))
(beep)
(calc-temp-minibuffer-message
@@ -455,14 +455,14 @@
(interactive)
(if (calc-minibuffer-contains ".*[@oh] *[^'m ]+[^'m]*\\'")
(calcDigit-key)
- (setq calc-digit-value (buffer-string))
+ (setq calc-digit-value (field-string))
(exit-minibuffer))
)
(defun calcDigit-edit ()
(interactive)
(calc-unread-command)
- (setq calc-digit-value (buffer-string))
+ (setq calc-digit-value (field-string))
(exit-minibuffer)
)
Index: calc.el
--- calc.el.~1~ Sun Dec 15 23:50:47 1996
+++ calc.el Wed Nov 22 13:08:49 2000
@@ -2051,11 +2051,11 @@
;; Exercise for the reader: Figure out why this is a good precaution!
(or (boundp 'calc-buffer)
(use-local-map minibuffer-local-map))
- (let ((str (buffer-string)))
+ (let ((str (field-string)))
(setq calc-digit-value (save-excursion
(set-buffer calc-buffer)
(math-read-number str))))
- (if (and (null calc-digit-value) (> (buffer-size) 0))
+ (if (and (null calc-digit-value) (> (field-end) (field-beginning)))
(progn
(beep)
(calc-temp-minibuffer-message " [Bad format]"))
@@ -2071,7 +2071,7 @@
(defun calc-minibuffer-contains (rex)
(save-excursion
- (goto-char (point-min))
+ (goto-char (field-end (point-min)))
(looking-at rex))
)
@@ -2158,10 +2158,8 @@
(upcase last-command-char))))
(and dig
(< dig radix)))))))
- (save-excursion
- (goto-char (point-min))
- (looking-at
- "[-+]?\\(.*\\+/- *\\|.*mod *\\)?\\([0-9]+\\.?0*[@oh] *\\)?\\([0-9]+\\.?0*['m] *\\)?[0-9]*\\(\\.?[0-9]*\\(e[-+]?[0-3]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?\\)?\\|[0-9]:\\([0-9]+:\\)?[0-9]*\\)?[\"s]?\\'")))
+ (calc-minibuffer-contains
+ "[-+]?\\(.*\\+/- *\\|.*mod *\\)?\\([0-9]+\\.?0*[@oh] *\\)?\\([0-9]+\\.?0*['m] *\\)?[0-9]*\\(\\.?[0-9]*\\(e[-+]?[0-3]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?\\)?\\|[0-9]:\\([0-9]+:\\)?[0-9]*\\)?[\"s]?\\'"))
(if (and (memq last-command-char '(?@ ?o ?h ?\' ?m))
(string-match " " calc-hms-format))
(insert " "))
@@ -2190,7 +2188,7 @@
((eq last-command 'calcDigit-start)
(erase-buffer))
(t (backward-delete-char 1)))
- (if (= (buffer-size) 0)
+ (if (= (field-beginning) (field-end))
(progn
(setq last-command-char 13)
(calcDigit-nondigit)))
* TeX'ing the Calc manual fails.
The following patches allow to build the Calc manual using texinfo.tex
from Emacs 19.34 distribution:
*** calc-maint.e~0 Mon Dec 16 07:11:26 1996
--- calc-maint.el Sun Dec 10 14:32:38 2000
***************
*** 308,314 ****
(insert "@tex\n"
"\\global\\advance\\appendixno2\n"
"\\gdef\\xref#1.{See ``#1.''}\n")
! (setq midpos (point))
(insert "@end tex\n")
(insert-buffer-substring srcbuf sumpos endpos)
(insert "@bye\n")
--- 308,314 ----
(insert "@tex\n"
"\\global\\advance\\appendixno2\n"
"\\gdef\\xref#1.{See ``#1.''}\n")
! (setq midpos (point-marker))
(insert "@end tex\n")
(insert-buffer-substring srcbuf sumpos endpos)
(insert "@bye\n")
*** Makefile.~0 Mon Dec 16 07:11:24 1996
--- Makefile Sun Dec 10 14:44:00 2000
***************
*** 98,106 ****
# Format the Calc manual as one printable volume using TeX.
tex:
$(REMOVE) calc.aux
! $(TEX) calc.texinfo
$(TEXINDEX) calc.[cfkptv]?
! $(TEX) calc.texinfo
$(PURGE) calc.cp calc.fn calc.pg calc.tp calc.vr
$(PURGE) calc.cps calc.fns calc.kys calc.pgs calc.tps calc.vrs
$(PURGE) calc.toc
--- 98,106 ----
# Format the Calc manual as one printable volume using TeX.
tex:
$(REMOVE) calc.aux
! -$(TEX) calc.texinfo
$(TEXINDEX) calc.[cfkptv]?
! -$(TEX) calc.texinfo
$(PURGE) calc.cp calc.fn calc.pg calc.tp calc.vr
$(PURGE) calc.cps calc.fns calc.kys calc.pgs calc.tps calc.vrs
$(PURGE) calc.toc
*** calc.texinfo.~1~ Thu Oct 10 18:18:56 1996
--- calc.texinfo Mon Dec 11 08:25:00 2000
***************
*** 12,17 ****
--- 12,19 ----
% Because makeinfo.c exists, we can't just define new commands.
% So instead, we take over little-used existing commands.
%
+ % Suggested by Karl Berry <karl@@freefriends.org>
+ \gdef\!{\mskip-\thinmuskip}
% Redefine @cite{text} to act like $text$ in regular TeX.
% Info will typeset this same as @samp{text}.
\gdef\goodtex{\tex \let\rm\goodrm \let\t\ttfont \turnoffactive}
***************
*** 23686,23692 ****
a vector of the actual parameter values, written as equations:
@cite{[a = 3, b = 2]}, in case you'd rather read them in a list
than pick them out of the formula. (You can type @kbd{t y}
! to move this vector to the stack; @pxref{Trail Commands}.)
Specifying a different independent variable name will affect the
resulting formula: @kbd{a F 1 k RET} produces @kbd{3 + 2 k}.
--- 23689,23695 ----
a vector of the actual parameter values, written as equations:
@cite{[a = 3, b = 2]}, in case you'd rather read them in a list
than pick them out of the formula. (You can type @kbd{t y}
! to move this vector to the stack; see @ref{Trail Commands}.)
Specifying a different independent variable name will affect the
resulting formula: @kbd{a F 1 k RET} produces @kbd{3 + 2 k}.
|
