xemacs-beta: lisp/w3/w3-hot.el comparison

comparison lisp/w3/w3-hot.el @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2

author	cvs
date	Mon, 13 Aug 2007 08:46:35 +0200
parents	376386a54a3c
children	9ee227acff29

comparison

equal deleted inserted replaced

-:c0c6a60d29db
+:ac2d302a0011
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; w3-hot.el --- Main functions for emacs-w3 on all platforms/versions
-;;; Copyright (c) 1993, 1994, 1995 by William M. Perry (wmperry@spry.com)
+;; Author: wmperry
+;; Created: 1996/07/26 05:22:59
+;; Version: 1.5
+;; Keywords: faces, help, comm, news, mail, processes, mouse, hypermedia
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Copyright (c) 1993 - 1996 by William M. Perry (wmperry@cs.indiana.edu)
 ;;;
 ;;; This file is not part of GNU Emacs, but the same permissions apply.
 ;;;
 ;;; GNU Emacs is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Hotlist Handling Code
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defvar w3-html-bookmarks nil)
+(defun w3-hotlist-break-shit ()
+(let ((todo '(w3-hotlist-apropos
+		w3-hotlist-delete
+		w3-hotlist-rename-entry
+		w3-hotlist-append
+		w3-use-hotlist
+		w3-hotlist-add-document
+		w3-hotlist-add-document-at-point
+		))
+	(cur nil))
+(while todo
+(setq cur (car todo)
+	    todo (cdr todo))
+(fset cur
+	    (`
+	     (lambda (&rest ignore)
+	       (error "Sorry, `%s' does not work with html bookmarks"
+		      (quote (, cur)))))))))
 (defun w3-read-html-bookmarks (fname)
 "Import an HTML file into the Emacs-w3 format."
 (interactive "fBookmark file: ")
 (if (not (file-readable-p fname))
 (error "Can not read %s..." fname))
 (let* ((w3-debug-html nil)
 	   (bkmarks nil)
 	   (parse (w3-parse-buffer (current-buffer) t)))
 (setq parse w3-last-parse-tree
 	    bkmarks (nreverse (w3-grok-html-bookmarks parse))
-	    w3-html-bookmarks bkmarks))))
+	    w3-html-bookmarks bkmarks)))
+(w3-hotlist-break-shit))
 (eval-when-compile
 (defvar cur-stack nil)
 (defvar cur-title nil)
 (defmacro push-new-menu ()
 	    content (and (listp node) (nth 2 node)))
 (cond
 ((eq tag 'title)
 	(setq cur-title (list (w3-normalize-spaces (car content))))
 	(w3-grok-html-bookmarks-internal content))
-((eq tag 'dl)
+((memq tag '(dl ol ul))
 	(push-new-menu)
 	(w3-grok-html-bookmarks-internal content)
 	(finish-submenu))
-((and (eq tag 'dt)
+((and (memq tag '(dt li))
 	     (stringp (car content)))
 	(setq cur-title (cons (w3-normalize-spaces (car content))
 			      cur-title)))
 ((and (eq tag 'a)
 	     (stringp (car-safe content))
 (let ((x w3-hotlist))
 (w3-parse-hotlist fname)
 (setq w3-hotlist (nconc x w3-hotlist))
 (and (fboundp 'w3-add-hotlist-menu) (funcall 'w3-add-hotlist-menu))))
+(defun w3-hotlist-parse-old-mosaic-format ()
+(let (cur-link cur-alias)
+(while (re-search-forward "^\n" nil t) (replace-match ""))
+(goto-line 3)
+(while (not (eobp))
+(re-search-forward "^[^ ]*" nil t)
+(setq cur-link (buffer-substring (match-beginning 0) (match-end 0)))
+(setq cur-alias (buffer-substring (progn
+					  (forward-line 1)
+					  (beginning-of-line)
+					  (point))
+					(progn
+					  (end-of-line)
+					  (point))))
+(if (not (equal cur-alias ""))
+	  (setq w3-hotlist (cons (list cur-alias cur-link) w3-hotlist)))
+(if (fboundp 'w3-add-hotlist-menu)
+	  (funcall 'w3-add-hotlist-menu)))))
 (defun w3-parse-hotlist (&optional fname)
 "Read in the hotlist specified by FNAME"
 (if (not fname) (setq fname w3-hotlist-file))
 (setq w3-hotlist nil)
 (if (not (file-exists-p fname))
 (message "%s does not exist!" fname)
 (let* ((old-buffer (current-buffer))
 	   (buffer (get-buffer-create " *HOTW3*"))
-	   cur-link
+	   (case-fold-search t))
-	   cur-alias)
 (set-buffer buffer)
 (erase-buffer)
 (insert-file-contents fname)
 (goto-char (point-min))
-(while (re-search-forward "^\n" nil t) (replace-match ""))
+(cond
-(goto-line 3)
+((looking-at "ncsa-xmosaic-hotlist-format-1");; Old-style NCSA Mosaic
-(while (not (eobp))
+	(w3-hotlist-parse-old-mosaic-format))
-	(re-search-forward "^[^ ]*" nil t)
+((or (looking-at "<!DOCTYPE")	; Some HTML style, including netscape
-	(setq cur-link (buffer-substring (match-beginning 0) (match-end 0)))
+	    (re-search-forward "<a[ \n]+href" nil t))
-	(setq cur-alias (buffer-substring (progn
+	(w3-read-html-bookmarks fname))
-					    (forward-line 1)
+(t
-					    (beginning-of-line)
+	(message "Cannot determine format of hotlist file: %s" fname)))
-					    (point))
+(set-buffer-modified-p nil)
-					  (progn
-					    (end-of-line)
-					    (point))))
-	(if (not (equal cur-alias ""))
-	    (setq w3-hotlist (cons (list cur-alias cur-link) w3-hotlist))))
 (kill-buffer buffer)
-(and (fboundp 'w3-add-hotlist-menu) (funcall 'w3-add-hotlist-menu))
 (set-buffer old-buffer))))
 ;;;###autoload
 (defun w3-use-hotlist ()
 "Possibly go to a link in your W3/Mosaic hotlist.
 (or url (error "No link under point."))
 (setq title (get-text-property (point) 'title))
 (if (and title
 	     (marker-buffer (car title))
 	     (marker-buffer (cdr title)))
-	(setq title (buffer-substring (car title) (cdr title)))
+	(setq title (buffer-substring-no-properties (car title) (cdr title)))
 (setq title "None"))
-(remove-text-properties 1 (length title))
 (w3-hotlist-add-document pref-arg title url)
 (and (fboundp 'w3-add-hotlist-menu) (funcall 'w3-add-hotlist-menu))))
 (defun w3-hotlist-add-document (pref-arg &optional the-title the-url)
 "Add this documents url to the hotlist"

Mercurial > hg > xemacs-beta

comparison lisp/w3/w3-hot.el @ 2:ac2d302a0011 r19-15b2