mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-31 20:02:42 +00:00
(idlwave-do-context-help1, idlwave-highlight-linked-completions): Replace
`assoc-ignore-case' by `assoc-string'.
This commit is contained in:
Juanma Barranquero
parent
5d10503f56
commit
cf4fa77aff
@ -36,7 +36,7 @@
|
||||
;; information, at:
|
||||
;;
|
||||
;; http://idlwave.org
|
||||
;;
|
||||
;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
|
||||
@ -52,10 +52,10 @@
|
||||
:group 'idlwave-online-help
|
||||
:type 'boolean)
|
||||
|
||||
(defvar idlwave-html-link-sep
|
||||
(defvar idlwave-html-link-sep
|
||||
(if idlwave-html-help-pre-v6 "#" "#wp"))
|
||||
|
||||
(defcustom idlwave-html-help-location
|
||||
(defcustom idlwave-html-help-location
|
||||
(if (memq system-type '(ms-dos windows-nt))
|
||||
nil
|
||||
"/usr/local/etc/")
|
||||
@ -83,7 +83,7 @@ Defaults to `browse-url-browser-function', which see."
|
||||
:group 'idlwave-online-help
|
||||
:type 'string)
|
||||
|
||||
(defcustom idlwave-help-browser-generic-args
|
||||
(defcustom idlwave-help-browser-generic-args
|
||||
(if (boundp 'browse-url-generic-args)
|
||||
browse-url-generic-args "")
|
||||
"Program args to use if using browse-url-generic-program."
|
||||
@ -191,7 +191,7 @@ support."
|
||||
|
||||
(defvar idlwave-help-activate-links-aggressively nil
|
||||
"Obsolete variable.")
|
||||
|
||||
|
||||
(defvar idlwave-completion-help-info)
|
||||
|
||||
(defvar idlwave-help-frame nil
|
||||
@ -314,7 +314,7 @@ It collects and prints the diagnostics messages."
|
||||
(setq idlwave-last-context-help-pos marker)
|
||||
(idlwave-do-context-help1 arg)
|
||||
(if idlwave-help-diagnostics
|
||||
(message "%s" (mapconcat 'identity
|
||||
(message "%s" (mapconcat 'identity
|
||||
(nreverse idlwave-help-diagnostics)
|
||||
"; "))))))
|
||||
|
||||
@ -323,7 +323,7 @@ It collects and prints the diagnostics messages."
|
||||
(defun idlwave-do-context-help1 (&optional arg)
|
||||
"The work-horse version of `idlwave-context-help', which see."
|
||||
(save-excursion
|
||||
(if (equal (char-after) ?/)
|
||||
(if (equal (char-after) ?/)
|
||||
(forward-char 1)
|
||||
(if (equal (char-before) ?=)
|
||||
(backward-char 1)))
|
||||
@ -333,7 +333,7 @@ It collects and prints the diagnostics messages."
|
||||
(beg (save-excursion (skip-chars-backward chars) (point)))
|
||||
(end (save-excursion (skip-chars-forward chars) (point)))
|
||||
(this-word (buffer-substring-no-properties beg end))
|
||||
(st-ass (assoc (downcase this-word)
|
||||
(st-ass (assoc (downcase this-word)
|
||||
idlwave-help-special-topic-words))
|
||||
(classtag (and (string-match "self\\." this-word)
|
||||
(< beg (- end 4))))
|
||||
@ -341,7 +341,7 @@ It collects and prints the diagnostics messages."
|
||||
(string-match "\\`\\([^.]+\\)\\." this-word)
|
||||
(< beg (- end 4))))
|
||||
module keyword cw mod1 mod2 mod3)
|
||||
(if (or arg
|
||||
(if (or arg
|
||||
(and (not st-ass)
|
||||
(not classtag)
|
||||
(not structtag)
|
||||
@ -360,15 +360,15 @@ It collects and prints the diagnostics messages."
|
||||
(setq module (list "init" 'fun (match-string 1 str))
|
||||
idlwave-current-obj_new-class (match-string 1 str))
|
||||
)))))
|
||||
(cond
|
||||
(cond
|
||||
(arg (setq mod1 module))
|
||||
|
||||
|
||||
;; A special topic -- only system help
|
||||
(st-ass (setq mod1 (list (cdr st-ass))))
|
||||
|
||||
|
||||
;; A system variable -- only system help
|
||||
((string-match
|
||||
"\\`!\\([a-zA-Z0-9_]+\\)\\(\.\\([A-Za-z0-9_]+\\)\\)?"
|
||||
((string-match
|
||||
"\\`!\\([a-zA-Z0-9_]+\\)\\(\.\\([A-Za-z0-9_]+\\)\\)?"
|
||||
this-word)
|
||||
(let* ((word (match-string-no-properties 1 this-word))
|
||||
(entry (assq (idlwave-sintern-sysvar word)
|
||||
@ -380,18 +380,19 @@ It collects and prints the diagnostics messages."
|
||||
(cdr (assq 'tags entry))))))
|
||||
(link (nth 1 (assq 'link entry))))
|
||||
(if tag-target
|
||||
(setq link (idlwave-substitute-link-target link
|
||||
(setq link (idlwave-substitute-link-target link
|
||||
tag-target)))
|
||||
(setq mod1 (list link))))
|
||||
|
||||
|
||||
;; An executive command -- only system help
|
||||
((string-match "^\\.\\([A-Z_]+\\)" this-word)
|
||||
(let* ((word (match-string 1 this-word))
|
||||
(link (cdr (assoc-ignore-case
|
||||
(link (cdr (assoc-string
|
||||
word
|
||||
idlwave-executive-commands-alist))))
|
||||
idlwave-executive-commands-alist
|
||||
t))))
|
||||
(setq mod1 (list link))))
|
||||
|
||||
|
||||
;; A class -- system OR in-text help (via class__define).
|
||||
((and (eq cw 'class)
|
||||
(or (idlwave-in-quote) ; e.g. obj_new
|
||||
@ -405,28 +406,28 @@ It collects and prints the diagnostics messages."
|
||||
(name (concat (downcase this-word) "__define"))
|
||||
(link (nth 1 (assq 'link entry))))
|
||||
(setq mod1 (list link name 'pro))))
|
||||
|
||||
|
||||
;; A class structure tag (self.BLAH) -- only in-text help available
|
||||
(classtag
|
||||
(let ((tag (substring this-word (match-end 0)))
|
||||
class-with found-in)
|
||||
(when (setq class-with
|
||||
(when (setq class-with
|
||||
(idlwave-class-or-superclass-with-tag
|
||||
(nth 2 (idlwave-current-routine))
|
||||
tag))
|
||||
(setq found-in (idlwave-class-found-in class-with))
|
||||
(if (assq (idlwave-sintern-class class-with)
|
||||
(if (assq (idlwave-sintern-class class-with)
|
||||
idlwave-system-class-info)
|
||||
(error "No help available for system class tags"))
|
||||
(setq idlwave-help-do-class-struct-tag t)
|
||||
(setq mod1 (list nil
|
||||
(setq mod1 (list nil
|
||||
(if found-in
|
||||
(cons (concat found-in "__define") class-with)
|
||||
(concat class-with "__define"))
|
||||
'pro
|
||||
nil ; no class.... it's a procedure!
|
||||
tag)))))
|
||||
|
||||
|
||||
;; A regular structure tag -- only in text, and if
|
||||
;; optional `complete-structtag' loaded.
|
||||
(structtag
|
||||
@ -437,7 +438,7 @@ It collects and prints the diagnostics messages."
|
||||
(setq idlwave-help-do-struct-tag
|
||||
idlwave-structtag-struct-location
|
||||
mod1 (list nil nil nil nil tag))))
|
||||
|
||||
|
||||
;; A routine keyword -- in text or system help
|
||||
((and (memq cw '(function-keyword procedure-keyword))
|
||||
(stringp this-word)
|
||||
@ -479,7 +480,7 @@ It collects and prints the diagnostics messages."
|
||||
(setq mod1 (append (list t) module (list keyword))
|
||||
mod2 (list t this-word 'fun nil)
|
||||
mod3 (append (list t) module)))))
|
||||
|
||||
|
||||
;; Everything else
|
||||
(t
|
||||
(setq mod1 (append (list t) module))))
|
||||
@ -512,14 +513,14 @@ Needs additional info stored in global `idlwave-completion-help-info'."
|
||||
word link)
|
||||
(mouse-set-point ev)
|
||||
|
||||
|
||||
|
||||
;; See if we can also find help somewhere, e.g. for multiple classes
|
||||
(setq word (idlwave-this-word))
|
||||
(if (string= word "")
|
||||
(error "No help item selected"))
|
||||
(setq link (get-text-property 0 'link word))
|
||||
(select-window cw)
|
||||
(cond
|
||||
(cond
|
||||
;; Routine name
|
||||
((memq what '(procedure function routine))
|
||||
(setq name word)
|
||||
@ -530,9 +531,9 @@ Needs additional info stored in global `idlwave-completion-help-info'."
|
||||
type)))
|
||||
(setq link t) ; No specific link valid yet
|
||||
(if sclasses
|
||||
(setq classes (idlwave-members-only
|
||||
(setq classes (idlwave-members-only
|
||||
classes (cons class sclasses))))
|
||||
(setq class (idlwave-popup-select ev classes
|
||||
(setq class (idlwave-popup-select ev classes
|
||||
"Select Class" 'sort))))
|
||||
|
||||
;; XXX is this necessary, given all-method-classes?
|
||||
@ -552,7 +553,7 @@ Needs additional info stored in global `idlwave-completion-help-info'."
|
||||
type)))
|
||||
(setq link t) ; Link can't be correct yet
|
||||
(if sclasses
|
||||
(setq classes (idlwave-members-only
|
||||
(setq classes (idlwave-members-only
|
||||
classes (cons class sclasses))))
|
||||
(setq class (idlwave-popup-select ev classes
|
||||
"Select Class" 'sort))
|
||||
@ -564,14 +565,14 @@ Needs additional info stored in global `idlwave-completion-help-info'."
|
||||
(if (string= (downcase name) "obj_new")
|
||||
(setq class idlwave-current-obj_new-class
|
||||
name "Init"))))
|
||||
|
||||
|
||||
;; Class name
|
||||
((eq what 'class)
|
||||
(setq class word
|
||||
word nil))
|
||||
|
||||
|
||||
;; A special named function to call which sets some of our variables
|
||||
((and (symbolp what)
|
||||
((and (symbolp what)
|
||||
(fboundp what))
|
||||
(funcall what 'set word))
|
||||
|
||||
@ -586,7 +587,7 @@ Needs additional info stored in global `idlwave-completion-help-info'."
|
||||
"Highlight all completions for which help is available and attach link.
|
||||
Those words in `idlwave-completion-help-links' have links. The
|
||||
`idlwave-help-link-face' face is used for this."
|
||||
(if idlwave-highlight-help-links-in-completion
|
||||
(if idlwave-highlight-help-links-in-completion
|
||||
(with-current-buffer (get-buffer "*Completions*")
|
||||
(save-excursion
|
||||
(let* ((case-fold-search t)
|
||||
@ -602,13 +603,13 @@ Those words in `idlwave-completion-help-links' have links. The
|
||||
(setq beg (match-beginning 1) end (match-end 1)
|
||||
word (match-string 1) doit nil)
|
||||
;; Call special completion function test
|
||||
(if (and (symbolp what)
|
||||
(if (and (symbolp what)
|
||||
(fboundp what))
|
||||
(setq doit (funcall what 'test word))
|
||||
;; Look for special link property passed in help-links
|
||||
(if idlwave-completion-help-links
|
||||
(setq doit (assoc-ignore-case
|
||||
word idlwave-completion-help-links))))
|
||||
(setq doit (assoc-string
|
||||
word idlwave-completion-help-links t))))
|
||||
(when doit
|
||||
(if (consp doit)
|
||||
(setq props (append props `(link ,(cdr doit)))))
|
||||
@ -633,13 +634,13 @@ Those words in `idlwave-completion-help-links' have links. The
|
||||
;; Try to select the return frame.
|
||||
;; This can crash on slow network connections, obviously when
|
||||
;; we kill the help frame before the return-frame is selected.
|
||||
;; To protect the workings, we wait for up to one second
|
||||
;; To protect the workings, we wait for up to one second
|
||||
;; and check if the return-frame *is* now selected.
|
||||
;; This is marked "eperimental" since we are not sure when its OK.
|
||||
(let ((maxtime 1.0) (time 0.) (step 0.1))
|
||||
(select-frame idlwave-help-return-frame)
|
||||
(while (and (sit-for step)
|
||||
(not (eq (selected-frame)
|
||||
(not (eq (selected-frame)
|
||||
idlwave-help-return-frame))
|
||||
(< (setq time (+ time step)) maxtime)))))
|
||||
(delete-frame idlwave-help-frame))
|
||||
@ -652,7 +653,7 @@ Those words in `idlwave-completion-help-links' have links. The
|
||||
(defvar default-toolbar-visible-p)
|
||||
|
||||
(defun idlwave-help-display-help-window (&optional pos-or-func)
|
||||
"Display the help window.
|
||||
"Display the help window.
|
||||
Move window start to POS-OR-FUNC, if passed as a position, or call it
|
||||
if passed as a function. See `idlwave-help-use-dedicated-frame'."
|
||||
(let ((cw (selected-window))
|
||||
@ -663,13 +664,13 @@ if passed as a function. See `idlwave-help-use-dedicated-frame'."
|
||||
(switch-to-buffer buf))
|
||||
;; Do it in this frame and save the window configuration
|
||||
(if (not (get-buffer-window buf nil))
|
||||
(setq idlwave-help-window-configuration
|
||||
(setq idlwave-help-window-configuration
|
||||
(current-window-configuration)))
|
||||
(display-buffer buf nil (selected-frame))
|
||||
(select-window (get-buffer-window buf)))
|
||||
(raise-frame)
|
||||
(if pos-or-func
|
||||
(if (functionp pos-or-func)
|
||||
(if pos-or-func
|
||||
(if (functionp pos-or-func)
|
||||
(funcall pos-or-func)
|
||||
(goto-char pos-or-func)
|
||||
(recenter 0)))
|
||||
@ -691,31 +692,31 @@ if passed as a function. See `idlwave-help-use-dedicated-frame'."
|
||||
(select-frame idlwave-help-return-frame)))
|
||||
|
||||
(defun idlwave-online-help (link &optional name type class keyword)
|
||||
"Display HTML or other special help on a certain topic.
|
||||
"Display HTML or other special help on a certain topic.
|
||||
Either loads an HTML link, if LINK is non-nil, or gets special-help on
|
||||
the optional arguments, if any special help is defined. If LINK is
|
||||
`t', first look up the optional arguments in the routine info list to
|
||||
see if a link is set for it. Try extra help functions if necessary."
|
||||
;; Lookup link
|
||||
(if (eq link t)
|
||||
(let ((entry (idlwave-best-rinfo-assoc name type class
|
||||
(if (eq link t)
|
||||
(let ((entry (idlwave-best-rinfo-assoc name type class
|
||||
(idlwave-routines) nil t)))
|
||||
(cond
|
||||
;; Try keyword link
|
||||
((and keyword
|
||||
((and keyword
|
||||
(setq link (cdr (idlwave-entry-find-keyword entry keyword)))))
|
||||
;; Default, regular entry link
|
||||
(t (setq link (idlwave-entry-has-help entry))))))
|
||||
|
||||
(cond
|
||||
;; An explicit link
|
||||
((stringp link)
|
||||
((stringp link)
|
||||
(idlwave-help-html-link link))
|
||||
|
||||
|
||||
;; Any extra help
|
||||
(idlwave-extra-help-function
|
||||
(idlwave-help-get-special-help name type class keyword))
|
||||
|
||||
|
||||
;; Nothing worked
|
||||
(t (idlwave-help-error name type class keyword))))
|
||||
|
||||
@ -726,7 +727,7 @@ see if a link is set for it. Try extra help functions if necessary."
|
||||
(help-pos (save-excursion
|
||||
(set-buffer (idlwave-help-get-help-buffer))
|
||||
(let ((buffer-read-only nil))
|
||||
(funcall idlwave-extra-help-function
|
||||
(funcall idlwave-extra-help-function
|
||||
name type class keyword)))))
|
||||
(if help-pos
|
||||
(idlwave-help-display-help-window help-pos)
|
||||
@ -740,7 +741,7 @@ see if a link is set for it. Try extra help functions if necessary."
|
||||
(browse-url-generic-program idlwave-help-browser-generic-program)
|
||||
;(browse-url-generic-args idlwave-help-browser-generic-args)
|
||||
full-link)
|
||||
|
||||
|
||||
(if (and (memq system-type '(ms-dos windows-nt))
|
||||
idlwave-help-use-hh)
|
||||
(progn
|
||||
@ -755,12 +756,12 @@ see if a link is set for it. Try extra help functions if necessary."
|
||||
;; Just a regular file name (+ anchor name)
|
||||
(unless (and (stringp help-loc)
|
||||
(file-directory-p help-loc))
|
||||
(error
|
||||
(error
|
||||
"Invalid help location; customize `idlwave-html-help-location'."))
|
||||
(setq full-link (concat
|
||||
(setq full-link (concat
|
||||
"file://"
|
||||
(expand-file-name
|
||||
link
|
||||
(expand-file-name
|
||||
link
|
||||
(expand-file-name "idl_html_help" help-loc)))))
|
||||
|
||||
;; Check for a local browser
|
||||
@ -796,7 +797,7 @@ This function can be used as `idlwave-extra-help-function'."
|
||||
(if class-only ;Help with class? Using "Init" as source.
|
||||
(setq name "Init"
|
||||
type 'fun))
|
||||
(if (not struct-tag)
|
||||
(if (not struct-tag)
|
||||
(setq file
|
||||
(idlwave-routine-source-file
|
||||
(nth 3 (idlwave-best-rinfo-assoc
|
||||
@ -809,7 +810,7 @@ This function can be used as `idlwave-extra-help-function'."
|
||||
(if (or struct-tag (stringp file))
|
||||
(progn
|
||||
(setq in-buf ; structure-tag completion is always in current buffer
|
||||
(if struct-tag
|
||||
(if struct-tag
|
||||
idlwave-current-tags-buffer
|
||||
(idlwave-get-buffer-visiting file)))
|
||||
;; see if file is in a visited buffer, insert those contents
|
||||
@ -831,19 +832,19 @@ This function can be used as `idlwave-extra-help-function'."
|
||||
;; Try to find a good place to display
|
||||
(setq def-pos
|
||||
;; Find the class structure tag if that's what we're after
|
||||
(cond
|
||||
(cond
|
||||
;; Class structure tags: find the class or named structure
|
||||
;; definition
|
||||
(class-struct-tag
|
||||
(save-excursion
|
||||
(save-excursion
|
||||
(setq class
|
||||
(if (string-match "[a-zA-Z0-9]\\(__\\)" name)
|
||||
(if (string-match "[a-zA-Z0-9]\\(__\\)" name)
|
||||
(substring name 0 (match-beginning 1))
|
||||
idlwave-current-tags-class))
|
||||
(and
|
||||
(idlwave-find-class-definition class nil real-class)
|
||||
(idlwave-find-struct-tag keyword))))
|
||||
|
||||
|
||||
;; Generic structure tags: the structure definition
|
||||
;; location within the file has been recorded in
|
||||
;; `struct-tag'
|
||||
@ -853,14 +854,14 @@ This function can be used as `idlwave-extra-help-function'."
|
||||
(integerp struct-tag)
|
||||
(goto-char struct-tag)
|
||||
(idlwave-find-struct-tag keyword))))
|
||||
|
||||
|
||||
;; Just find the routine definition
|
||||
(t
|
||||
(if class-only (point-min)
|
||||
(idlwave-help-find-routine-definition name type class keyword))))
|
||||
idlwave-help-def-pos def-pos)
|
||||
|
||||
(if (and idlwave-help-source-try-header
|
||||
(if (and idlwave-help-source-try-header
|
||||
(not (or struct-tag class-struct-tag)))
|
||||
;; Check if we can find the header
|
||||
(save-excursion
|
||||
@ -870,7 +871,7 @@ This function can be used as `idlwave-extra-help-function'."
|
||||
idlwave-help-in-header header-pos)))
|
||||
|
||||
(if (or header-pos def-pos)
|
||||
(progn
|
||||
(progn
|
||||
(if (boundp 'idlwave-help-min-frame-width)
|
||||
(setq idlwave-help-min-frame-width 80))
|
||||
(goto-char (or header-pos def-pos)))
|
||||
@ -884,7 +885,7 @@ This function can be used as `idlwave-extra-help-function'."
|
||||
KEYWORD is ignored. Returns the point of match if successful, nil otherwise."
|
||||
(save-excursion
|
||||
(goto-char (point-max))
|
||||
(if (re-search-backward
|
||||
(if (re-search-backward
|
||||
(concat "^[ \t]*"
|
||||
(if (eq type 'pro) "pro"
|
||||
(if (eq type 'fun) "function"
|
||||
@ -930,22 +931,22 @@ with spaces allowed between the keyword and the following dash or equal sign.
|
||||
If there is a match, we assume it is the keyword description."
|
||||
(let* ((case-fold-search t)
|
||||
(rname (if (stringp class)
|
||||
(concat
|
||||
(concat
|
||||
"\\("
|
||||
;; Traditional name or class::name
|
||||
"\\("
|
||||
"\\(" (regexp-quote (downcase class)) "::\\)?"
|
||||
(regexp-quote (downcase name))
|
||||
"\\>\\)"
|
||||
(concat
|
||||
(concat
|
||||
"\\|"
|
||||
;; class__define or just class
|
||||
(regexp-quote (downcase class)) "\\(__define\\)?")
|
||||
"\\)")
|
||||
(regexp-quote (downcase name))))
|
||||
|
||||
|
||||
;; NAME tag plus the routine name. The new version is from JD.
|
||||
(name-re (concat
|
||||
(name-re (concat
|
||||
"\\(^;+\\*?[ \t]*"
|
||||
idlwave-help-doclib-name
|
||||
"\\([ \t]*:\\|[ \t]*$\\)[ \t]*\\(\n;+[ \t]*\\)*"
|
||||
@ -980,7 +981,7 @@ If there is a match, we assume it is the keyword description."
|
||||
(regexp-quote (upcase keyword))
|
||||
"\\>")))
|
||||
dstart dend name-pos kwds-pos kwd-pos)
|
||||
(catch 'exit
|
||||
(catch 'exit
|
||||
(save-excursion
|
||||
(goto-char (point-min))
|
||||
(while (and (setq dstart (re-search-forward idlwave-doclib-start nil t))
|
||||
@ -988,7 +989,7 @@ If there is a match, we assume it is the keyword description."
|
||||
;; found a routine header
|
||||
(goto-char dstart)
|
||||
(if (setq name-pos (re-search-forward name-re dend t))
|
||||
(progn
|
||||
(progn
|
||||
(if keyword
|
||||
;; We do need a keyword
|
||||
(progn
|
||||
@ -1070,7 +1071,7 @@ When DING is non-nil, ring the bell as well."
|
||||
(idlwave-help-find-first-header nil)
|
||||
(setq idlwave-help-in-header nil)
|
||||
(idlwave-help-toggle-header-match-and-def arg 'top)))
|
||||
|
||||
|
||||
(defun idlwave-help-toggle-header-match-and-def (arg &optional top)
|
||||
(interactive "P")
|
||||
(let ((args idlwave-help-args)
|
||||
@ -1082,7 +1083,7 @@ When DING is non-nil, ring the bell as well."
|
||||
(setq pos idlwave-help-def-pos))
|
||||
;; Try to display header
|
||||
(setq pos (apply 'idlwave-help-find-in-doc-header
|
||||
(if top
|
||||
(if top
|
||||
(list (car args) (nth 1 args) (nth 2 args) nil)
|
||||
args)))
|
||||
(if pos
|
||||
@ -1116,7 +1117,7 @@ Useful when source code is displayed as help. See the option
|
||||
(font-lock-fontify-buffer))
|
||||
(set-syntax-table syntax-table)))))
|
||||
|
||||
|
||||
|
||||
(defun idlwave-help-error (name type class keyword)
|
||||
(error "Can't find help on %s%s %s"
|
||||
(or (and (or class name) (idlwave-make-full-name class name))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user