summaryrefslogtreecommitdiff
path: root/lisp/calc
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2005-04-26 12:17:42 +0000
committerKaroly Lorentey <lorentey@elte.hu>2005-04-26 12:17:42 +0000
commit030cd69ff13d95f439ca0d13a03215fc45959789 (patch)
tree4554735b53848a05f107b8b421a898e0e9fe7ee6 /lisp/calc
parent3379bbb24d58ecd8dca0c96b976b7031167e76a5 (diff)
parent35b1b8abe3d3833ecb4b4cee75b7340ffb707d65 (diff)
downloademacs-030cd69ff13d95f439ca0d13a03215fc45959789.tar.gz
emacs-030cd69ff13d95f439ca0d13a03215fc45959789.tar.bz2
emacs-030cd69ff13d95f439ca0d13a03215fc45959789.zip
Merged from miles@gnu.org--gnu-2005 (patch 279-280)
Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-279 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-280 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-335
Diffstat (limited to 'lisp/calc')
-rw-r--r--lisp/calc/calc-help.el14
-rw-r--r--lisp/calc/calc.el2
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 46b8cec2ac6..2a89bb2b883 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -393,12 +393,14 @@ C-w Describe how there is no warranty for Calc."
(error "Can't locate Calc sources"))
(calc-quit)
(switch-to-buffer "*Help*")
- (erase-buffer)
- (insert-file-contents (expand-file-name "README" (car path)))
- (search-forward "Summary of changes")
- (forward-line -1)
- (delete-region (point-min) (point))
- (goto-char (point-min))))
+ (let ((inhibit-read-only t))
+ (erase-buffer)
+ (insert-file-contents (expand-file-name "README" (car path)))
+ (search-forward "Summary of changes")
+ (forward-line -1)
+ (delete-region (point-min) (point))
+ (goto-char (point-min)))
+ (help-mode)))
(defvar calc-help-long-names '((?b . "binary/business")
(?g . "graphics")
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index ceee013e493..ce9681b828f 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1174,8 +1174,6 @@ commands given here will actually operate on the *Calculator* stack."
(setq buffer-read-only t)
(make-local-variable 'overlay-arrow-position)
(make-local-variable 'overlay-arrow-string)
- (set (make-local-variable 'font-lock-defaults)
- '(nil t nil nil nil (font-lock-core-only . t)))
(when buf
(set (make-local-variable 'calc-main-buffer) buf))
(when (= (buffer-size) 0)