diff lisp/w3/w3-display.el @ 32:e04119814345 r19-15b99

Import from CVS: tag r19-15b99
author cvs
date Mon, 13 Aug 2007 08:52:56 +0200
parents ec9a17fef872
children c53a95d3c46d
line wrap: on
line diff
--- a/lisp/w3/w3-display.el	Mon Aug 13 08:52:30 2007 +0200
+++ b/lisp/w3/w3-display.el	Mon Aug 13 08:52:56 2007 +0200
@@ -1,7 +1,7 @@
 ;;; w3-display.el --- display engine v99999
 ;; Author: wmperry
-;; Created: 1997/03/06 04:12:42
-;; Version: 1.144
+;; Created: 1997/03/14 06:33:15
+;; Version: 1.147
 ;; Keywords: faces, help, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -440,14 +440,6 @@
 
 ;; Various macros
 (eval-when-compile
-  (defmacro w3-expand-url (url)
-    (`
-     (url-expand-file-name (, url)
-			   (cdr-safe
-			    (assoc
-			     (cdr-safe
-			      (assq 'base args)) w3-base-alist)))))
-
   (defmacro w3-handle-empty-tag ()
     (`
      (progn
@@ -1684,7 +1676,7 @@
 		     (if cols
 			 (setq w3-frameset-dimensions (push cols w3-frameset-dimensions))))
 		   (w3-handle-content node))
-	       (w3-handle-empty-tag)))
+	       (w3-handle-content node)))
 	    (frame
 	     (if w3-display-frames
 		 (let* ((href (or (w3-get-attribute 'src)
@@ -1705,7 +1697,8 @@
 					(list
 					 (car w3-frame-labels)
 					 name
-					 (cdr w3-frame-labels)))))))))))
+					 (cdr w3-frame-labels)))))))))
+	       (w3-handle-empty-tag)))
 	    (noframes
 	     (if w3-display-frames
 		 (w3-handle-empty-tag)
@@ -2070,9 +2063,9 @@
   (and (not w3-running-xemacs)
        (not (eq (device-type) 'tty))
        (w3-fixup-eol-faces))
-  (message "Drawing... done")
-  ;;(w3-handle-headers)
-  )
+  (let ((inhibit-read-only t))
+    (put-text-property (point-min) (point-max) 'read-only nil))
+  (message "Drawing... done"))
 
 (defun w3-region (st nd)
   (if (not w3-setup-done) (w3-do-setup))