Package: psgml
Version: 1.3.1-12
Severity: wishlist
Tags: patch
The following patch typically makes parsing several times faster in
Emacs if `sgml-set-face' is on. It doesn't have any effect in XEmacs
or Emacs when sgml-set-face is nil.
While I'm about it, it also avoids some compilation warnings and
removes the setting of an unused variable outside the package's name
space.
I should have submitted it long ago for PSGML, but I don't remember
doing so. I'll post to the PSGML list if I can, but I've previously
had trouble with that, so I'm not trying to cc this.
Changes to speed up parsing under Emacs when setting faces. They're
against the Debian version of psgml-1.3.1, but probably apply generally.
Also avoid a few warnings.
2005-01-28 Dave Love <[EMAIL PROTECTED]>
* psgml-other.el (sgml-parse-in-loop): Defvar when compiling.
(sgml-set-face-for): Use sgml-parse-in-loop.
* psgml-dtd.el (sgml-write-dtd): Don't set file-type (unused).
* psgml-parse.el (mc-flag, which-func-mode): Defvar when
compiling.
(sgml-parse-in-loop): New variable.
(sgml-parser-loop): Use it and sgml-with-modification-state.
--- psgml-dtd.el 2005/01/28 12:32:58 1.1
+++ psgml-dtd.el 2005/01/28 12:42:54
@@ -1002,7 +1002,6 @@
"(sgml-saved-dtd-version 7)\n")
(let ((print-escape-multibyte t))
(sgml-code-dtd dtd))
- (set 'file-type 1)
(let ((coding-system-for-write 'no-conversion))
(write-region (point-min) (point-max) file)))
--- psgml-other.el 2005/01/28 12:29:37 1.1
+++ psgml-other.el 2005/01/28 13:01:11
@@ -139,11 +139,20 @@
(when (not modified)
(sgml-restore-buffer-modified-p nil))))))
+(eval-when-compile
+ (defvar sgml-parse-in-loop))
+
(defun sgml-set-face-for (start end type)
(let ((face (cdr (assq type sgml-markup-faces))))
(cond
(sgml-use-text-properties
- (sgml-with-modification-state
+ ;; `sgml-with-modification-state' is rather expensive. If we're
+ ;; in the parsing loop, hoist the job out of the loop.
+ (if (not sgml-parse-in-loop)
+ (sgml-with-modification-state
+ (put-text-property start end 'face face)
+ (when (and sgml-default-nonsticky (< start end))
+ (put-text-property (1- end) end 'rear-nonsticky '(face))))
(put-text-property start end 'face face)
(when (and sgml-default-nonsticky (< start end))
(put-text-property (1- end) end 'rear-nonsticky '(face)))))
--- psgml-parse.el 2005/01/28 12:29:37 1.1
+++ psgml-parse.el 2005/01/28 12:56:28
@@ -349,6 +349,8 @@
(sgml-restore-buffer-modified-p buffer-modified)
(sgml-debug "Restoring buffer mod: %s" buffer-modified)))))
+(eval-when-compile (defvar mc-flag))
+
(defun sgml-set-buffer-multibyte (flag)
(cond ((featurep 'xemacs)
flag)
@@ -357,6 +359,7 @@
(if (eq flag 'default)
default-enable-multibyte-characters
flag)))
+ ;; I doubt the current code works in old Mule anyway. -- fx
((boundp 'MULE)
(set 'mc-flag flag))
(t
@@ -2854,6 +2857,8 @@
(message "Fontifying...done"))
(error nil))))
+(eval-when-compile (defvar which-func-mode))
+
(defun sgml-set-active-dtd-indicator (name)
;; At least when using the which-func machinery, don't show anything
;; unless `sgml-live-element-indicator' is non-nil.
@@ -4044,9 +4049,16 @@
(sgml-set-markup-type nil))
(defvar sgml-parser-loop-hook nil)
+(defvar sgml-parse-in-loop nil
+ "Non-nil means the body of `sgml-parser-loop' is executing.
+Thus lower-level functions don't need to use `sgml-with-modification-state'.")
(defun sgml-parser-loop (extra-cond)
(let (tem
- (sgml-signal-data-function (function sgml-pcdata-move)))
+ (sgml-signal-data-function (function sgml-pcdata-move))
+ ;; Speed up significantly by effectively hoisting
+ ;; `sgml-with-modification-state' out of the loop.
+ (sgml-parse-in-loop t))
+ (sgml-with-modification-state
(while (and (eq sgml-current-tree sgml-top-tree)
(or (< (point) sgml-goal) sgml-current-eref)
(progn (setq sgml-markup-start (point)
@@ -4091,7 +4103,7 @@
((and sgml-parser-loop-hook
(run-hook-with-args-until-success 'sgml-parser-loop-hook)))
(t
- (sgml-do-pcdata))))))
+ (sgml-do-pcdata)))))))
(defun sgml-handle-shortref (name)
(sgml-set-markup-type 'shortref)
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (900, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.8-1-686
Locale: LANG=en_GB, LC_CTYPE=en_GB (charmap=ISO-8859-1)
Versions of packages psgml depends on:
ii emacs21 21.3+1-8 The GNU Emacs editor
ii sgml-base 1.26 SGML infrastructure and SGML catal
ii sgml-data 2.0.2 common SGML and XML data
ii ucf 1.13 Update Configuration File: preserv
-- no debconf information
