From: Eli Zaretskii Date: Fri, 15 Feb 2002 11:31:12 +0000 (+0000) Subject: Fixes from Dave Love for W3 and PSGML entries. X-Git-Tag: emacs-21.2~85 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fec26539b4c3fde98a96feb828b669194434510f;p=emacs.git Fixes from Dave Love for W3 and PSGML entries. --- diff --git a/etc/PROBLEMS b/etc/PROBLEMS index abfb6e17757..b7dcee41463 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -563,37 +563,9 @@ this problem by putting this in your `.emacs' file: (setq ange-ftp-ftp-program-args '("-i" "-n" "-g" "-v" "--prompt" "") -* The latest released version of the W3 package doesn't run properly -with Emacs 21 and needs work. However, these problems are already -fixed in W3's CVS. The patch below is reported to make w3-4.0pre.46 -work. - -Some users report they are unable to byte-compile W3 with Emacs 21. -If the patches below don't help to resolve your problems, install the -CVS version of W3, which should be compatible with Emacs 21. - -diff -aur --new-file w3-4.0pre.46-orig/lisp/w3-display.el w3-4.0pre.46-new/lisp/w3-display.el ---- w3-4.0pre.46-orig/lisp/w3-display.el Sun Nov 14 22:00:12 1999 -+++ w3-4.0pre.46-new/lisp/w3-display.el Thu Dec 14 14:59:15 2000 -@@ -181,7 +181,8 @@ - (dispatch-event (next-command-event))) - (error nil)))) - (t -- (if (and (not (sit-for 0)) (input-pending-p)) -+ ;; modified for GNU Emacs 21 by bob@rattlesnake.com on 2000 Dec 14 -+ (if (and (not (sit-for 0)) nil) - (condition-case () - (progn - (setq w3-pause-keystroke -diff -aur --new-file w3-4.0pre.46-orig/lisp/w3-e21.el w3-4.0pre.46-new/lisp/w3-e21.el ---- w3-4.0pre.46-orig/lisp/w3-e21.el Thu Jan 1 00:00:00 1970 -+++ w3-4.0pre.46-new/lisp/w3-e21.el Thu Dec 14 14:54:58 2000 -@@ -0,0 +1,5 @@ -+;;; w3-e21.el --- ** required for GNU Emacs 21 ** -+;; Added by bob@rattlesnake.com on 2000 Dec 14 -+ -+(require 'w3-e19) -+(provide 'w3-e21) +* Some versions of the W3 package released before Emacs 21.1 don't run +properly with Emacs 21. These problems are fixed in W3 version +4.0pre.47. * On AIX, if linking fails because libXbsd isn't found, check if you are compiling with the system's `cc' and CFLAGS containing `-O5'. If @@ -602,123 +574,14 @@ Emacs so that it isn't compiled with `-O5'. * Compiling on AIX 4.3.x or 4.4 fails. -This could happen if you use /bin/c89 as youir compiler, instead of +This could happen if you use /bin/c89 as your compiler, instead of the default `cc'. /bin/c89 treats certain warnings, such as benign redefinitions of macros, as errors, and fails the build. A solution is to use the default compiler `cc'. -* The PSGML package uses the obsolete variables +* Old versions of the PSGML package use the obsolete variables `before-change-function' and `after-change-function', which are no -longer used by Emacs. These changes to PSGML 1.2.2 fix that. - ---- 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 +longer used by Emacs. Please use PSGML 1.2.3 or later. * The Calc package fails to build and signals errors with Emacs 21.