emacs: lisp/progmodes/idlwave.el comparison

comparison lisp/progmodes/idlwave.el @ 90667:dbe3f29e61d6

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 505-522) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: etc/TUTORIAL.cn: Updated. - Merge from erc--emacs--22 * gnus--rel--5.10 (patch 164-167) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137

author	Miles Bader <miles@gnu.org>
date	Tue, 21 Nov 2006 08:56:38 +0000
parents	02cf29720f31 a15c9975c15b
children	f1d13e615070

comparison

equal deleted inserted replaced

-:00d54c8fa693
+:dbe3f29e61d6
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
 ;;          Chris Chase <chase@att.com>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
-;; Version: 6.0_em22
+;; Version: 6.1_em22
 ;; Keywords: languages
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 (defconst idlwave-continuation-char ?$
 "Character which is inserted as a last character on previous line by
 \\[idlwave-split-line] to begin a continuation line.  Normally $.")
-(defconst idlwave-mode-version "6.0_em22")
+(defconst idlwave-mode-version "6.1_em22")
 (defmacro idlwave-keyword-abbrev (&rest args)
 "Creates a function for abbrev hooks to call `idlwave-check-abbrev' with args."
 `(quote (lambda ()
 	    ,(append '(idlwave-check-abbrev) args))))
 "Compile and run the region." t)
 (define-key idlwave-mode-map "\C-c\C-v"   'idlwave-find-module)
 (define-key idlwave-mode-map "\C-c\C-t"   'idlwave-find-module-this-file)
 (define-key idlwave-mode-map "\C-c?"      'idlwave-routine-info)
 (define-key idlwave-mode-map "\M-?"       'idlwave-context-help)
-(define-key idlwave-mode-map [(control meta ?\?)] 'idlwave-online-help)
+(define-key idlwave-mode-map [(control meta ?\?)]
+'idlwave-help-assistant-help-with-topic)
 ;; Pickup both forms of Esc/Meta binding
 (define-key idlwave-mode-map [(meta tab)] 'idlwave-complete)
 (define-key idlwave-mode-map [?\e?\t] 'idlwave-complete)
 (define-key idlwave-mode-map "\M-\C-i" 'idlwave-complete)
 (define-key idlwave-mode-map "\C-c\C-i" 'idlwave-update-routine-info)
 (defvar idlwave-mode-menu)
 (defvar idlwave-mode-debug-menu)
 ;;;###autoload
 (defun idlwave-mode ()
-"Major mode for editing IDL source files (version 6.0_em22).
+"Major mode for editing IDL source files (version 6.1_em22).
 The main features of this mode are
 1. Indentation and Formatting
 --------------------------
 "[ \t\f]*$\\|[ \t]*;+[ \t]*$\\|;+[+=-_*]+$")
 (set (make-local-variable 'paragraph-start) "[ \t\f]\\|[ \t]*;+[ \t]")
 (set (make-local-variable 'paragraph-ignore-fill-prefix) nil)
 (set (make-local-variable 'parse-sexp-ignore-comments) t)
+;; ChangeLog
+(set (make-local-variable 'add-log-current-defun-function)
+'idlwave-current-routine-fullname)
 ;; Set tag table list to use IDLTAGS as file name.
 (if (boundp 'tag-table-alist)
 (add-to-list 'tag-table-alist '("\\.pro$" . "IDLTAGS")))
-;; Font-lock additions - originally Phil Williams, then Ulrik Dickow
+;; Font-lock additions
 ;; Following line is for Emacs - XEmacs uses the corresponding property
 ;; on the `idlwave-mode' symbol.
 (set (make-local-variable 'font-lock-defaults) idlwave-font-lock-defaults)
 (set (make-local-variable 'font-lock-mark-block-function)
 'idlwave-mark-subprogram)
 		     idlwave-begin-block-reg
 		     idlwave-end-block-reg
 		     ";"
 		     'idlwave-forward-block nil))
 ;; Make a local post-command-hook and add our hook to it
 ;; NB: `make-local-hook' needed for older/alternative Emacs compatibility
 ;; (make-local-hook 'post-command-hook)
 (add-hook 'post-command-hook 'idlwave-command-hook nil 'local)
 ;; Make local hooks for buffer updates
 ;; NB: `make-local-hook' needed for older/alternative Emacs compatibility
 ;; (make-local-hook 'kill-buffer-hook)
 (add-hook 'kill-buffer-hook 'idlwave-kill-buffer-update nil 'local)
 ;; (make-local-hook 'after-save-hook)
-;; (add-hook 'after-save-hook 'idlwave-save-buffer-update nil 'local)
+(add-hook 'after-save-hook 'idlwave-save-buffer-update nil 'local)
 (add-hook 'after-save-hook 'idlwave-revoke-license-to-kill nil 'local)
 ;; Setup directories and file, if necessary
 (idlwave-setup)
 		(forward-line 1)
 		(push-mark beg nil t)
 		(message "Could not find end of doc library header.")))
 	  (message "Could not find doc library header start.")
 	  (goto-char here)))))
+(defun idlwave-current-routine-fullname ()
+(let ((name (idlwave-current-routine)))
+(idlwave-make-full-name (nth 2 name) (car name))))
 (defun idlwave-current-routine ()
 "Return (NAME TYPE CLASS) of current routine."
 (idlwave-routines)
 (save-excursion
 	    (insert comment-start " " idlwave-doc-modifications-keyword ":"))
 	  (insert "\n;\n;\t")
 	  (run-hooks 'idlwave-timestamp-hook))
 (error "No valid DOCLIB header"))))
 ;;; CJC 3/16/93
 ;;; Interface to expand-region-abbrevs which did not work when the
 ;;; abbrev hook associated with an abbrev moves point backwards
 ;;; after abbrev expansion, e.g., as with the abbrev '.n'.
 ;;; The original would enter an infinite loop in attempting to expand
 	       (expand-file-name "help/online_help" (idlwave-sys-dir))))
 	 (catalog-file (expand-file-name "idl_catalog.xml" dir))
 	 (elem-cnt 0)
 	 props rinfo msg-cnt elem type nelem class-result alias
 	 routines routine-aliases statement-aliases sysvar-aliases
-	 buf version-string)
+	 version-string)
 (if (not (file-exists-p catalog-file))
 	(error "No such XML routine info file: %s" catalog-file)
 (if (not (file-readable-p catalog-file))
 	  (error "Cannot read XML routine info file: %s" catalog-file)))
 (require 'xml)
 (message "Reading XML routine info...")
-(unwind-protect
+(setq rinfo (xml-parse-file catalog-file))
-	(progn
-	  ;; avoid warnings about read-only files
-	  (setq buf (find-file-noselect catalog-file 'nowarn))
-	  (setq rinfo (xml-parse-file catalog-file)))
-(if (bufferp buf) (kill-buffer buf)))
 (message "Reading XML routine info...done")
 (setq rinfo (assq 'CATALOG rinfo))
 (unless rinfo (error "Failed to parse XML routine info"))
 ;;(setq rinfo (car rinfo)) ; Skip the catalog stuff.
 ((eq mode 'test) ; we can at least link the main
 (and (stringp word) entry main))
 ((eq mode 'set)
 (if entry
 	  (setq link
-		(if (setq target (cdr (assoc word tags)))
+		(if (setq target (cdr (assoc-string word tags t)))
 		  (idlwave-substitute-link-target main target)
 		main)))) ;; setting dynamic!!!
 (t (error "This should not happen")))))
 (defun idlwave-split-link-target (link)
 (t (error "This should not happen"))))
 (defun idlwave-class-or-superclass-with-tag (class tag)
 "Find and return the CLASS or one of its superclass with the
 associated TAG, if any."
-(let ((sclasses (cons class (cdr (assq 'all-inherits
+(let ((sclasses (cons class (idlwave-all-class-inherits class)))
-					 (idlwave-class-info class)))))
 	cl)
 (catch 'exit
 (while sclasses
 (setq cl (pop sclasses))
 (let ((tags (idlwave-class-tags cl)))
 ["Commentary in idlwave.el" idlwave-show-commentary t]
 ["Commentary in idlw-shell.el" idlwave-shell-show-commentary t]
 "--"
 ["Info" idlwave-info t]
 "--"
+["Help with Topic" idlwave-help-assistant-help-with-topic
+idlwave-help-use-assistant]
 ["Launch IDL Help" idlwave-launch-idlhelp t])))
 (defvar idlwave-mode-debug-menu-def
 '("Debug"
 ["Start IDL shell" idlwave-shell t]

Mercurial > emacs

comparison lisp/progmodes/idlwave.el @ 90667:dbe3f29e61d6