branch: externals/idlwave
commit 3932828c572c0e2cbf03094455fe7090a80d793b
Author: JD Smith <[email protected]>
Commit: JD Smith <[email protected]>
Don't use integers as anchors anymore.
IDL 8 changed the anchor notation away from #wp12345, so just save it as a
string.
---
idlw-help.el | 3 +--
idlwave.el | 11 +++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/idlw-help.el b/idlw-help.el
index 7716fab7d7..bfaebc6f32 100644
--- a/idlw-help.el
+++ b/idlw-help.el
@@ -52,8 +52,7 @@
:group 'idlwave-online-help
:type 'boolean)
-(defvar idlwave-html-link-sep
- (if idlwave-html-help-pre-v6 "#" "#wp"))
+(defvar idlwave-html-link-sep "#")
(defcustom idlwave-html-system-help-location "help/"
"The directory, relative to idlwave-system-directory, where the
diff --git a/idlwave.el b/idlwave.el
index 90a8318710..a7f459dcaf 100644
--- a/idlwave.el
+++ b/idlwave.el
@@ -7627,8 +7627,7 @@ property indicating the link is added."
(concat
file
(if link
- (concat idlwave-html-link-sep
- (number-to-string link))))
+ (concat idlwave-html-link-sep link)))
key))
(push (list key) kwds)))
(cdr key-list))))
@@ -7647,7 +7646,7 @@ property indicating the link is added."
(if (and file (cdr kwd))
(concat file
idlwave-html-link-sep
- (number-to-string (cdr kwd)))
+ (cdr kwd))
(cdr kwd))))
(throw 'exit kwd))))
(nthcdr 5 entry))))
@@ -7797,9 +7796,9 @@ property indicating the link is added."
(defun idlwave-split-link-target (link)
"Split a given LINK into link file and anchor."
- (if (string-match idlwave-html-link-sep link)
+ (if (and (stringp link) (string-match idlwave-html-link-sep link))
(cons (substring link 0 (match-beginning 0))
- (string-to-number (substring link (match-end 0))))))
+ (substring link (match-end 0)))))
(defun idlwave-substitute-link-target (link target)
"Substitute the TARGET anchor for the given LINK."
@@ -7808,7 +7807,7 @@ property indicating the link is added."
(substring link 0 (match-beginning 0))
link))
(if target
- (concat main-base idlwave-html-link-sep (number-to-string target))
+ (concat main-base idlwave-html-link-sep target)
link)))
;; Fake help in the source buffer for class structure tags.