2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15d2eed13b6..e02f109db9e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-22  Martin Rudalics  <rudalics@gmx.at>
+
+        * progmodes/fortran.el (fortran-mode-map, fortran-window-create):
+        Use window-full-width-p.
+
 2007-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emulation/tpu-edt.el (tpu-edt-old-global-values): New var.
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 16992c54523..c400ea3099d 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -585,7 +585,7 @@ Used in the Fortran entry in `hs-special-modes-alist'.")
         ["72-column window"       fortran-window-create t]
         ["Full Width Window"
          (enlarge-window-horizontally (- (frame-width) (window-width)))
-         (< (window-width) (frame-width))]
+         (not (window-full-width-p))]
         ["Momentary 72-column window" fortran-window-create-momentarily t]
         "--"
         ["Break Line at Point"    fortran-split-line t]
@@ -944,9 +944,9 @@ The next key typed is executed unless it is SPC."
 See also `fortran-window-create-momentarily'."
   (interactive)
   (let ((window-min-width 2))
-    (if (< (window-width) (frame-width))
-        (enlarge-window-horizontally (- (frame-width)
-                                        (window-width) 1)))
+    (unless (window-full-width-p)
+      (enlarge-window-horizontally (- (frame-width)
+                                      (window-width) 1)))
     (let* ((window-edges (window-edges))
            (scroll-bar-width (- (nth 2 window-edges)
                                 (car window-edges)