comparison lisp/w3/w3-display.el @ 169:15872534500d r20-3b11

Import from CVS: tag r20-3b11
author cvs
date Mon, 13 Aug 2007 09:46:53 +0200
parents 5a88923fcbfe
children 8eaf7971accc
comparison
equal deleted inserted replaced
168:9851d5c6556e 169:15872534500d
1 ;;; w3-display.el --- display engine v99999 1 ;;; w3-display.el --- display engine v99999
2 ;; Author: wmperry 2 ;; Author: wmperry
3 ;; Created: 1997/06/25 14:30:16 3 ;; Created: 1997/07/01 15:54:50
4 ;; Version: 1.189 4 ;; Version: 1.192
5 ;; Keywords: faces, help, hypermedia 5 ;; Keywords: faces, help, hypermedia
6 6
7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
8 ;;; Copyright (c) 1996 by William M. Perry (wmperry@cs.indiana.edu) 8 ;;; Copyright (c) 1996 by William M. Perry (wmperry@cs.indiana.edu)
9 ;;; Copyright (c) 1996, 1997 Free Software Foundation, Inc. 9 ;;; Copyright (c) 1996, 1997 Free Software Foundation, Inc.
156 156
157 (defsubst w3-pause () 157 (defsubst w3-pause ()
158 (save-excursion 158 (save-excursion
159 (goto-char (or (symbol-value 'cur-viewing-pos) (point-min))) 159 (goto-char (or (symbol-value 'cur-viewing-pos) (point-min)))
160 (cond 160 (cond
161 (w3-running-FSF19 161 (w3-running-xemacs
162 (if (and (not (sit-for 0)) (input-pending-p))
163 (condition-case ()
164 (dispatch-event (next-command-event))
165 (error nil))))
166 (t
162 (if (and (not (sit-for 0)) (input-pending-p)) 167 (if (and (not (sit-for 0)) (input-pending-p))
163 (condition-case () 168 (condition-case ()
164 (progn 169 (progn
165 (set 'cur-viewing-pos 170 (set 'cur-viewing-pos
166 (lookup-key w3-mode-map (vector (read-event)))) 171 (lookup-key w3-mode-map (vector (read-event))))
167 (case (symbol-value 'cur-viewing-pos) 172 (case (symbol-value 'cur-viewing-pos)
168 ((w3-quit w3-leave-buffer) nil) 173 ((w3-quit w3-leave-buffer) nil)
169 (otherwise (call-interactively (symbol-value 'cur-viewing-pos))))) 174 (otherwise (call-interactively (symbol-value 'cur-viewing-pos)))))
170 (error nil)))) 175 (error nil)))))
171 (w3-running-xemacs
172 (if (and (not (sit-for 0)) (input-pending-p))
173 (condition-case ()
174 (dispatch-event (next-command-event))
175 (error nil))))
176 (t (sit-for 0)))
177 (set 'cur-viewing-pos (point)))) 176 (set 'cur-viewing-pos (point))))
178 177
179 (defmacro w3-get-pad-string (len) 178 (defmacro w3-get-pad-string (len)
180 (` (cond 179 (` (cond
181 ((< (, len) 0) 180 ((< (, len) 0)
382 (while (re-search-forward 381 (while (re-search-forward
383 " [ \t\n\r]+\\|[\t\n\r][ \t\n\r]*" 382 " [ \t\n\r]+\\|[\t\n\r][ \t\n\r]*"
384 nil 'move) 383 nil 'move)
385 (replace-match " ")) 384 (replace-match " "))
386 (goto-char w3-scratch-start-point) 385 (goto-char w3-scratch-start-point)
387 (if (and (memq (preceding-char) '(? ?\t ?\r ?\n)) 386 (if (and (memq (char-before) '(? ?\t ?\r ?\n))
388 (looking-at "[ \t\r\n]")) 387 (looking-at "[ \t\r\n]"))
389 (delete-region (point) 388 (delete-region (point)
390 (progn 389 (progn
391 (skip-chars-forward " \t\r\n") 390 (skip-chars-forward " \t\r\n")
392 (point))))) 391 (point)))))