From a8955be718cb1263f7c3bb5987204bfbae85b806 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 11 Jun 2011 17:57:24 -0700 Subject: [PATCH] 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. --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/f90.el | 12 +----------- lisp/progmodes/fortran.el | 1 + 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d5f1517572..c14655699e7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-06-12 Glenn Morris + + * 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 * emacs-lisp/syntax.el (syntax-ppss): Clarify which items are invalid. diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 28f5d329fd5..849b9c0c3f7 100644 --- 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 f03d2013467..d30b9673d09 100644 --- 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. -- 2.39.2