(fortran-indent-to-column): "?\ " -> "?\s".

[gnu-emacs] / lisp / progmodes / fortran.el

diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 30e1977d28dbf96269933e78bc5cfa95b8e2f7b0..3b6c77fef297a0b67c4bddc141b6f8cfdfa40035 100644 (file)
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -1,7 +1,7 @@
 ;;; fortran.el --- Fortran mode for GNU Emacs
 
 ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-;;               2003, 2004, 2005  Free Software Foundation, Inc.
+;;               2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Michael D. Prange <prange@erl.mit.edu>
 ;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -55,6 +55,8 @@
 
 (eval-when-compile                     ; silence compiler
   (defvar dabbrev-case-fold-search)
+  (defvar font-lock-syntactic-keywords)
+  (defvar gud-find-expr-function)
   (defvar imenu-case-fold-search)
   (defvar imenu-syntax-alist))
 
@@ -799,7 +801,7 @@ with no args, if that value is non-nil."
        #'fortran-current-defun)
   (set (make-local-variable 'dabbrev-case-fold-search) 'case-fold-search)
   (set (make-local-variable 'gud-find-expr-function) 'fortran-gud-find-expr)
-  (run-hooks 'fortran-mode-hook))
+  (run-mode-hooks 'fortran-mode-hook))
 
 \f
 (defun fortran-gud-find-expr ()
@@ -1646,7 +1648,7 @@ notes: 1) A non-zero/non-blank character in column 5 indicates a continuation
            (let* ((char (if (stringp fortran-comment-indent-char)
                             (aref fortran-comment-indent-char 0)
                           fortran-comment-indent-char))
-                  (chars (string ?  ?\t char)))
+                  (chars (string ?\s ?\t char)))
              (goto-char (match-end 0))
              (skip-chars-backward chars)
              (delete-region (point) (progn (skip-chars-forward chars)
@@ -1656,7 +1658,7 @@ notes: 1) A non-zero/non-blank character in column 5 indicates a continuation
          (if indent-tabs-mode
              (goto-char (match-end 0))
            (delete-char 2)
-           (insert-char ?  5)
+           (insert-char ?\s 5)
            (insert fortran-continuation-string))
        (if (looking-at " \\{5\\}[^ 0\n]")
            (if indent-tabs-mode