[Emacs-diffs] Changes to emacs/lisp/emulation/edt.el

[Richard M . Stallman]

Index: emacs/lisp/emulation/edt.el
diff -c emacs/lisp/emulation/edt.el:1.46 emacs/lisp/emulation/edt.el:1.47
*** emacs/lisp/emulation/edt.el:1.46    Sat Jul  2 14:01:11 2005
--- emacs/lisp/emulation/edt.el Sun Jul  3 16:24:30 2005
***************
*** 346,351 ****
--- 346,356 ----
  
  (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)
  
  ;;;;
  ;;;; EDT Emulation Commands
***************
*** 1635,1643 ****
  
  (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,
  and `mark-paragraph' for other modes."
    (interactive)
    (if edt-select-mode
--- 1640,1647 ----
  
  (defun edt-mark-section-wisely ()
    "Mark the section in a manner consistent with the `major-mode'.
! 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,1659 ****
          (edt-reset))
      (progn
        (cond  ((or (eq major-mode 'emacs-lisp-mode)
                  (eq major-mode 'lisp-mode))
              (mark-defun)
              (message "Lisp defun selected"))
             ((eq major-mode 'c-mode)
!             (mark-c-function)
              (message "C function selected"))
-            ((eq major-mode 'fortran-mode)
-             (mark-fortran-subprogram)
-             (message "Fortran subprogram selected"))
             (t (mark-paragraph)
                (message "Paragraph selected"))))))
  
--- 1649,1661 ----
          (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)
!             (c-mark-function)
              (message "C function selected"))
             (t (mark-paragraph)
                (message "Paragraph selected"))))))
  
***************
*** 1780,1787 ****
    "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))
  
  ;;;
  ;;; LEARN
--- 1782,1788 ----
    "Display the current time."
    (interactive)
    (if edt-x-emacs19-p (setq zmacs-region-stays t))
!   (message "%s" (current-time-string)))
  
  ;;;
  ;;; LEARN