Give % punctuation syntax in fortran modes (bug#8820)

* lisp/progmodes/fortran.el (fortran-mode-syntax-table):
* lisp/progmodes/f90.el (f90-mode-syntax-table):
Set % to punctuation.
(f90-find-tag-default): Remove, no longer needed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d5f151757294ec36d8bf88c8199cd09a272c5ac..c14655699e77073e776610af6e5d32be86ba8679 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-12  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/fortran.el (fortran-mode-syntax-table):
+       * progmodes/f90.el (f90-mode-syntax-table):
+       Set % to punctuation.  (Bug#8820)
+       (f90-find-tag-default): Remove, no longer needed.
+
 2011-06-12  Daniel Colascione  <dan.colascione@gmail.com>
 
        * emacs-lisp/syntax.el (syntax-ppss): Clarify which items are invalid.

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 28f5d329fd536e6124219bec329f864017130cb6..849b9c0c3f72d847eeee1ed22dc7576a4916b321 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -629,6 +629,7 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
     (modify-syntax-entry ?=  "."  table)
     (modify-syntax-entry ?*  "."  table)
     (modify-syntax-entry ?/  "."  table)
+    (modify-syntax-entry ?%  "."  table) ; bug#8820
     ;; I think that the f95 standard leaves the behavior of \
     ;; unspecified, but that f2k will require it to be non-special.
     ;; Use `f90-backslash-not-special' to change.
@@ -2199,17 +2200,6 @@ 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.
 With optional argument ALL, change the default for all present

diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index f03d201346718d5e9cb5eea2c5f5f6086f6f6da9..d30b9673d09436f0c2d2cec6e465c8c9ca8f4406 100644 (file)
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -600,6 +600,7 @@ Used in the Fortran entry in `hs-special-modes-alist'.")
     (modify-syntax-entry ?=  "."  table)
     (modify-syntax-entry ?*  "."  table)
     (modify-syntax-entry ?/  "."  table)
+    (modify-syntax-entry ?%  "."  table) ; bug#8820
     (modify-syntax-entry ?\' "\"" table)
     (modify-syntax-entry ?\" "\"" table)
     ;; Consistent with GNU Fortran's default -- see the manual.