aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2004-10-21 19:09:46 +0000
committerStefan Monnier2004-10-21 19:09:46 +0000
commit22101fbb14bb3873c753e40f2800db9d5bfd297f (patch)
tree0c9a8d2c1834081e65d9e48c5016df0a3b1fd1d9
parentc27ed90af576892cae147bfe6be1a8b43126102a (diff)
downloademacs-22101fbb14bb3873c753e40f2800db9d5bfd297f.tar.gz
emacs-22101fbb14bb3873c753e40f2800db9d5bfd297f.zip
(calc-describe-bindings): Fix last change.
-rw-r--r--lisp/ChangeLog32
-rw-r--r--lisp/calc/calc-help.el7
2 files changed, 22 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfe96a80d10..e32d4aaecca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12004-10-21 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * calc/calc-help.el (calc-describe-bindings): Fix last change.
4
12004-10-21 John Paul Wallington <jpw@gnu.org> 52004-10-21 John Paul Wallington <jpw@gnu.org>
2 6
3 * calc/calc-graph.el (calc-graph-init): 7 * calc/calc-graph.el (calc-graph-init):
@@ -25,11 +29,11 @@
252004-10-19 Jay Belanger <belanger@truman.edu> 292004-10-19 Jay Belanger <belanger@truman.edu>
26 30
27 * calc/calc.el (calc-emacs-type-19, calc-emacs-type-epoch) 31 * calc/calc.el (calc-emacs-type-19, calc-emacs-type-epoch)
28 (calc-emacs-type-gnu19): Removed. 32 (calc-emacs-type-gnu19): Remove.
29 (calc-digit-map, calc-read-key-sequence, calc-read-key): Removed 33 (calc-digit-map, calc-read-key-sequence, calc-read-key):
30 check for old emacs versions. 34 Remove check for old emacs versions.
31 35
32 * calc/calc-ext.el (calc-fancy-prefix): Removed emacs version check. 36 * calc/calc-ext.el (calc-fancy-prefix): Remove emacs version check.
33 (calc-init-extensions): Define `calc-alg-map' and `calc-alg-esc-map' 37 (calc-init-extensions): Define `calc-alg-map' and `calc-alg-esc-map'
34 for current Emacs. 38 for current Emacs.
35 39
@@ -38,9 +42,9 @@
38 (calc-do-alg-entry): Remove Emacs version check. Use `copy-keymap' to 42 (calc-do-alg-entry): Remove Emacs version check. Use `copy-keymap' to
39 copy `esc-map'. 43 copy `esc-map'.
40 44
41 * calc/calc-graph.el (calc-graph-plot): Removed emacs version check. 45 * calc/calc-graph.el (calc-graph-plot): Remove emacs version check.
42 46
43 * calc/calc-mode.el (calc-total-algebraic-mode): Removed error 47 * calc/calc-mode.el (calc-total-algebraic-mode): Remove error
44 call that would be given when the current emacs was used. 48 call that would be given when the current emacs was used.
45 49
462004-10-19 Ulf Jasper <ulf.jasper@web.de> 502004-10-19 Ulf Jasper <ulf.jasper@web.de>
@@ -73,8 +77,8 @@
73 77
742004-10-18 Jay Belanger <belanger@truman.edu> 782004-10-18 Jay Belanger <belanger@truman.edu>
75 79
76 * calc/calc-help.el (calc-describe-bindings): Set 80 * calc/calc-help.el (calc-describe-bindings):
77 `buffer-read-only' to nil while working in the keybindings buffer; 81 Set `buffer-read-only' to nil while working in the keybindings buffer;
78 remove some extra information from the keybindings buffer. 82 remove some extra information from the keybindings buffer.
79 83
802004-10-18 David Ponce <david@dponce.com> 842004-10-18 David Ponce <david@dponce.com>
@@ -261,12 +265,12 @@
2612004-10-12 Jay Belanger <belanger@truman.edu> 2652004-10-12 Jay Belanger <belanger@truman.edu>
262 266
263 * calc/calc-help.el (calc-help-function-list, calc-help-variable-list): 267 * calc/calc-help.el (calc-help-function-list, calc-help-variable-list):
264 New variables. 268 New variables.
265 (calc-help-index-entries): New function. 269 (calc-help-index-entries): New function.
266 (calc-describe-function): Use `calc-help-function-list' instead of 270 (calc-describe-function): Use `calc-help-function-list' instead of
267 obarray for completion. 271 obarray for completion.
268 (calc-describe-variable): Use `calc-help-variable-list' instead 272 (calc-describe-variable): Use `calc-help-variable-list' instead
269 of obarray for completion. 273 of obarray for completion.
270 274
2712004-10-12 Richard M. Stallman <rms@gnu.org> 2752004-10-12 Richard M. Stallman <rms@gnu.org>
272 276
@@ -334,7 +338,7 @@
334 338
335 * calc/calc-misc.el (calc-info-goto-node): New function. 339 * calc/calc-misc.el (calc-info-goto-node): New function.
336 (calc-tutorial, calc-info-summary): Go to appropriate Calc info 340 (calc-tutorial, calc-info-summary): Go to appropriate Calc info
337 node in one step. 341 node in one step.
338 (calc-describe-copying, calc-describe-distribution) 342 (calc-describe-copying, calc-describe-distribution)
339 (calc-describe-thing, calc-describe-no-warranty, calc-describe-key): 343 (calc-describe-thing, calc-describe-no-warranty, calc-describe-key):
340 Go to appropriate info node in one step. 344 Go to appropriate info node in one step.
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index c48ac23e8e5..99df2292f25 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -1,6 +1,7 @@
1;;; calc-help.el --- help display functions for Calc, 1;;; calc-help.el --- help display functions for Calc,
2 2
3;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002 Free Software Foundation, Inc. 3;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2004
4;; Free Software Foundation, Inc.
4 5
5;; Author: David Gillespie <daveg@synaptics.com> 6;; Author: David Gillespie <daveg@synaptics.com>
6;; Maintainers: D. Goel <deego@gnufans.org> 7;; Maintainers: D. Goel <deego@gnufans.org>
@@ -112,7 +113,7 @@ C-w Describe how there is no warranty for Calc."
112 (describe-bindings) 113 (describe-bindings)
113 (save-excursion 114 (save-excursion
114 (set-buffer "*Help*") 115 (set-buffer "*Help*")
115 (let ((buffer-read-only nil)) 116 (let ((inhibit-read-only t))
116 (goto-char (point-min)) 117 (goto-char (point-min))
117 (when (search-forward "Major Mode Bindings:" nil t) 118 (when (search-forward "Major Mode Bindings:" nil t)
118 (delete-region (point-min) (point)) 119 (delete-region (point-min) (point))
@@ -673,5 +674,5 @@ C-w Describe how there is no warranty for Calc."
673 "} (matrix brackets); . (abbreviate); / (multi-lines)") 674 "} (matrix brackets); . (abbreviate); / (multi-lines)")
674 "vec/mat" ?v)) 675 "vec/mat" ?v))
675 676
676;;; arch-tag: 2d347593-7591-449e-a64a-93dab5f2f686 677;; arch-tag: 2d347593-7591-449e-a64a-93dab5f2f686
677;;; calc-help.el ends here 678;;; calc-help.el ends here