f90.el fix for bug#7919.

* lisp/progmodes/f90.el (f90-find-tag-default): New function.
(f90-mode): Use it for mode's `find-tag-default-function' property.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b0e901c..58d30fc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-04  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/f90.el (f90-find-tag-default): New function.  (Bug#7919)
+       (f90-mode): Use it for mode's `find-tag-default-function' property.
+
 2011-02-03  Glenn Morris  <rgm@gnu.org>
 
        * ibuf-ext.el (ibuffer-filter-disable): Make it work.  (Bug#7969)

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index a4a986b..afdd2f2 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -2205,6 +2205,16 @@ CHANGE-WORD should be one of 'upcase-word, 'downcase-word, 'capitalize-word."
   (save-excursion
     (nth 1 (f90-beginning-of-subprogram))))
 
+(defun f90-find-tag-default ()
+  "Function to use for `find-tag-default-function' property in F90 mode."
+  (let ((tag (find-tag-default)))
+    (or (and tag
+             ;; See bug#7919. TODO I imagine there are other cases...?
+             (string-match "%\\(.+\\)" tag)
+             (match-string-no-properties 1 tag))
+        tag)))
+
+(put 'f90-mode 'find-tag-default-function 'f90-find-tag-default)
 
 (defun f90-backslash-not-special (&optional all)
   "Make the backslash character (\\) be non-special in the current buffer.