575 |
|
|
576 |
* The PSGML package uses the obsolete variables |
* The PSGML package uses the obsolete variables |
577 |
`before-change-function' and `after-change-function', which are no |
`before-change-function' and `after-change-function', which are no |
578 |
longer used by Emacs. These changes to PSGML 1.2.2 fix that. |
longer used by Emacs. Please PSGML 1.2.3 or later. |
|
|
|
|
--- psgml-edit.el 2001/03/03 00:23:31 1.1 |
|
|
+++ psgml-edit.el 2001/03/03 00:24:22 |
|
|
@@ -264,4 +264,4 @@ |
|
|
; inhibit-read-only |
|
|
- (before-change-function nil) |
|
|
- (after-change-function nil)) |
|
|
+ (before-change-functions nil) |
|
|
+ (after-change-functions nil)) |
|
|
(setq selective-display t) |
|
|
@@ -1544,3 +1544,3 @@ |
|
|
(buffer-read-only nil) |
|
|
- (before-change-function nil) |
|
|
+ (before-change-functions nil) |
|
|
(markup-index ; match-data index in tag regexp |
|
|
@@ -1596,3 +1596,3 @@ |
|
|
(defun sgml-expand-shortref-to-text (name) |
|
|
- (let (before-change-function |
|
|
+ (let (before-change-functions |
|
|
(entity (sgml-lookup-entity name (sgml-dtd-entities sgml-dtd-info)))) |
|
|
@@ -1613,3 +1613,3 @@ |
|
|
(re-found nil) |
|
|
- before-change-function) |
|
|
+ before-change-functions) |
|
|
(goto-char sgml-markup-start) |
|
|
@@ -1646,3 +1646,3 @@ |
|
|
(goto-char (sgml-element-end element)) |
|
|
- (let ((before-change-function nil)) |
|
|
+ (let ((before-change-functions nil)) |
|
|
(sgml-normalize-content element only-one))) |
|
|
Index: psgml-other.el |
|
|
--- psgml-other.el 2001/03/03 00:23:42 1.1 |
|
|
+++ psgml-other.el 2001/03/03 00:30:05 |
|
|
@@ -32,2 +32,3 @@ |
|
|
(require 'easymenu) |
|
|
+(eval-when-compile (require 'cl)) |
|
|
|
|
|
@@ -61,4 +62,9 @@ |
|
|
(let ((submenu |
|
|
- (subseq entries 0 (min (length entries) |
|
|
- sgml-max-menu-size)))) |
|
|
+;;; (subseq entries 0 (min (length entries) |
|
|
+;;; sgml-max-menu-size)) |
|
|
+ (let ((new (copy-sequence entries))) |
|
|
+ (setcdr (nthcdr (1- (min (length entries) |
|
|
+ sgml-max-menu-size)) |
|
|
+ new) nil) |
|
|
+ new))) |
|
|
(setq entries (nthcdr sgml-max-menu-size entries)) |
|
|
@@ -113,9 +119,10 @@ |
|
|
(let ((inhibit-read-only t) |
|
|
- (after-change-function nil) ; obsolete variable |
|
|
- (before-change-function nil) ; obsolete variable |
|
|
(after-change-functions nil) |
|
|
- (before-change-functions nil)) |
|
|
+ (before-change-functions nil) |
|
|
+ (modified (buffer-modified-p)) |
|
|
+ (buffer-undo-list t) |
|
|
+ deactivate-mark) |
|
|
(put-text-property start end 'face face) |
|
|
- (when (< start end) |
|
|
- (put-text-property (1- end) end 'rear-nonsticky '(face))))) |
|
|
+ (when (and (not modified) (buffer-modified-p)) |
|
|
+ (set-buffer-modified-p nil)))) |
|
|
(t |
|
|
Index: psgml-parse.el |
|
|
--- psgml-parse.el 2001/03/03 00:23:57 1.1 |
|
|
+++ psgml-parse.el 2001/03/03 00:29:56 |
|
|
@@ -40,2 +40,4 @@ |
|
|
|
|
|
+(eval-when-compile (require 'cl)) |
|
|
+ |
|
|
|
|
|
@@ -2493,8 +2495,8 @@ |
|
|
(setq sgml-scratch-buffer nil)) |
|
|
- (when after-change-function ;*** |
|
|
- (message "OOPS: after-change-function not NIL in scratch buffer %s: %s" |
|
|
+ (when after-change-functions ;*** |
|
|
+ (message "OOPS: after-change-functions not NIL in scratch buffer %s: %S" |
|
|
(current-buffer) |
|
|
- after-change-function) |
|
|
- (setq before-change-function nil |
|
|
- after-change-function nil)) |
|
|
+ after-change-functions) |
|
|
+ (setq before-change-functions nil |
|
|
+ after-change-functions nil)) |
|
|
(setq sgml-last-entity-buffer (current-buffer)) |
|
|
@@ -2878,6 +2880,5 @@ |
|
|
"Set initial state of parsing" |
|
|
- (make-local-variable 'before-change-function) |
|
|
- (setq before-change-function 'sgml-note-change-at) |
|
|
- (make-local-variable 'after-change-function) |
|
|
- (setq after-change-function 'sgml-set-face-after-change) |
|
|
+ (set (make-local-variable 'before-change-functions) '(sgml-note-change-at)) |
|
|
+ (set (make-local-variable 'after-change-functions) |
|
|
+ '(sgml-set-face-after-change)) |
|
|
(sgml-set-active-dtd-indicator (sgml-dtd-doctype dtd)) |
|
|
@@ -3925,7 +3926,7 @@ |
|
|
(sgml-need-dtd) |
|
|
- (unless before-change-function |
|
|
- (message "WARN: before-change-function has been lost, restoring (%s)" |
|
|
+ (unless before-change-functions |
|
|
+ (message "WARN: before-change-functions has been lost, restoring (%s)" |
|
|
(current-buffer)) |
|
|
- (setq before-change-function 'sgml-note-change-at) |
|
|
- (setq after-change-function 'sgml-set-face-after-change)) |
|
|
+ (setq before-change-functions '(sgml-note-change-at)) |
|
|
+ (setq after-change-functions '(sgml-set-face-after-change))) |
|
|
(sgml-with-parser-syntax-ro |
|
|
|
|
|
* 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 |
|
579 |
|
|
580 |
* Unicode characters are not unified with other Mule charsets. |
* Unicode characters are not unified with other Mule charsets. |
581 |
|
|