(edt-last-copied-word): Add defvar.

(zmacs-region-stays): Likewise.
(edt-mark-section-wisely): Use c-mark-function for C.
Use makr-defun for Fortran.
(time-string): defvar deleted.
(edt-display-the-time): Don't set time-string.

diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index fdda9adb577e4551cc605eaeeb15a3ed1e194700..2b9a1118603d000b35ba87efaa8b719549c5725b 100644 (file)
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -346,6 +346,11 @@ This means that an edt-user.el file was found in the user's `load-path'.")
 
 (defvar edt-keys-file nil
   "User's custom keypad and function keys mappings to emulate LK-201 keyboard.")
+
+(defvar edt-last-copied-word nil
+  "Last word that the user copied.")
+
+(defvar zmacs-region-stays)
 \f
 ;;;;
 ;;;; EDT Emulation Commands
@@ -1635,9 +1640,8 @@ Argument NUM is the percentage into the buffer to move."
 
 (defun edt-mark-section-wisely ()
   "Mark the section in a manner consistent with the `major-mode'.
-Uses `mark-defun' for emacs-lisp and Lisp,
-mark-c-function for C,
-mark-fortran-subsystem for fortran,
+Uses `mark-defun' for Emacs-Lisp and Lisp, and for Fortran,
+`c-mark-function' for C,
 and `mark-paragraph' for other modes."
   (interactive)
   (if edt-select-mode
@@ -1645,15 +1649,13 @@ and `mark-paragraph' for other modes."
         (edt-reset))
     (progn
       (cond  ((or (eq major-mode 'emacs-lisp-mode)
+                 (eq major-mode 'fortran-mode)
                  (eq major-mode 'lisp-mode))
              (mark-defun)
              (message "Lisp defun selected"))
             ((eq major-mode 'c-mode)
-             (mark-c-function)
+             (c-mark-function)
              (message "C function selected"))
-            ((eq major-mode 'fortran-mode)
-             (mark-fortran-subprogram)
-             (message "Fortran subprogram selected"))
             (t (mark-paragraph)
                (message "Paragraph selected"))))))
 
@@ -1780,8 +1782,7 @@ Argument NUM is the number of times to duplicate the line."
   "Display the current time."
   (interactive)
   (if edt-x-emacs19-p (setq zmacs-region-stays t))
-  (set 'time-string (current-time-string))
-  (message "%s" time-string))
+  (message "%s" (current-time-string)))
 
 ;;;
 ;;; LEARN