From dcc1269137d42e9b590ef48608595e2a2fec1b6a Mon Sep 17 00:00:00 2001 From: ryants Date: Thu, 19 Apr 2001 03:39:05 +0000 Subject: [PATCH] Can now load tags file from URL --- ChangeLog | 5 +++-- lisp/doxymacs.el | 25 ++++++++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98c2438..317d1a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ -$Id: ChangeLog,v 1.6 2001/04/19 03:06:14 ryants Exp $ +$Id: ChangeLog,v 1.7 2001/04/19 03:39:05 ryants Exp $ 2001-04-18 Ryan T. Sammartino * lisp/doxymacs.el: Going with Kris' "new style" look up - code. It's excellent, and exactly what I wanted. Thanks Kris. + code. It's excellent, and exactly what I wanted. Thanks Kris. Also + incorprated Andreas Fuchs' patch for loading tags from a URL. 2001-04-11 Ryan T. Sammartino * lisp/doxymacs.el: insert blank or "file" doxygen comments with style diff --git a/lisp/doxymacs.el b/lisp/doxymacs.el index c30088d..179fd78 100644 --- a/lisp/doxymacs.el +++ b/lisp/doxymacs.el @@ -1,6 +1,6 @@ ;; doxymacs.el ;; -;; $Id: doxymacs.el,v 1.11 2001/04/19 03:06:14 ryants Exp $ +;; $Id: doxymacs.el,v 1.12 2001/04/19 03:39:05 ryants Exp $ ;; ;; ELisp package for making doxygen related stuff easier. ;; @@ -28,6 +28,8 @@ ;; ChangeLog ;; ;; 18/04/2001 - Going with Kris' "new style" look up code. It's excellent. +;; - Incorprated Andreas Fuchs' patch for loading tags from a +;; URL. ;; ;; 11/04/2001 - added ability to insert blank doxygen comments with either ;; Qt or JavaDoc style. @@ -68,8 +70,9 @@ :group 'doxymacs) (defcustom doxymacs-doxygen-tags - "../example/doc/doxy.tag" - "*File that contains doxygen tags" + "file:///home/ryants/projects/doxymacs/example/doc/doxy.tag" +; "../example/doc/doxy.tag" + "*File name or URL that contains doxygen tags" :type 'string :group 'doxymacs) @@ -114,8 +117,20 @@ (progn (setq doxymacs-tags-buffer (generate-new-buffer "*doxytags*")) (let ((currbuff (current-buffer))) - (set-buffer doxymacs-tags-buffer) - (insert-file-contents doxymacs-doxygen-tags) + (if (file-regular-p doxymacs-doxygen-tags) + ;;It's a regular file, so just grab it. + (progn + (set-buffer doxymacs-tags-buffer) + (insert-file-contents doxymacs-doxygen-tags)) + ;; Otherwise, try and grab it as a URL + ;; FIXME What if something goes wrong? + (let ((url-working-buffer + (cdr (url-retrieve doxymacs-doxygen-tags)))) + (set-buffer url-working-buffer) + (url-uncompress) + (set-buffer doxymacs-tags-buffer) + (insert-buffer url-working-buffer) + (kill-buffer url-working-buffer))) (set-buffer currbuff))))) ;; doxymacs-fill-completion-list