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

[Miles Bader]

Index: emacs/lisp/emulation/edt.el
diff -c emacs/lisp/emulation/edt.el:1.42 emacs/lisp/emulation/edt.el:1.43
*** emacs/lisp/emulation/edt.el:1.42    Mon Nov 11 20:41:25 2002
--- emacs/lisp/emulation/edt.el Tue Feb  4 07:56:02 2003
***************
*** 27,33 ****
  
  
  ;;; Commentary:
! ;; 
  
  ;; This is Version 4.0 of the EDT Emulation for Emacs 19 and above.
  ;; It comes with special functions which replicate nearly all of EDT's
--- 27,33 ----
  
  
  ;;; Commentary:
! ;;
  
  ;; This is Version 4.0 of the EDT Emulation for Emacs 19 and above.
  ;; It comes with special functions which replicate nearly all of EDT's
***************
*** 41,50 ****
  
  ;; Getting Started:
  
! ;; To start the EDT Emulation, first start Emacs and then enter 
  ;;
  ;;    M-x edt-emulation-on
! ;;    
  ;; to begin the emulation.  After initialization is complete, the
  ;; following message will appear below the status line informing you
  ;; that the emulation has been enabled: "Default EDT keymap active".
--- 41,50 ----
  
  ;; Getting Started:
  
! ;; To start the EDT Emulation, first start Emacs and then enter
  ;;
  ;;    M-x edt-emulation-on
! ;;
  ;; to begin the emulation.  After initialization is complete, the
  ;; following message will appear below the status line informing you
  ;; that the emulation has been enabled: "Default EDT keymap active".
***************
*** 59,71 ****
  ;; Emacs "etc" directory.  It contains very helpful user information.
  
  ;; The EDT emulation consists of the following files:
! ;; 
  ;; edt-user.doc     - User Instructions and Sample Customization File
  ;; edt.el           - EDT Emulation Functions and Default Configuration
  ;; edt-lk201.el     - Built-in support for DEC LK-201 Keyboards
  ;; edt-vt100.el     - Built-in support for DEC VT-100 (and above) terminals
  ;; edt-pc.el        - Built-in support for PC 101 Keyboards under MS-DOS
! ;; edt-mapper.el    - Create an EDT LK-201 Map File for Keyboards Without 
  ;;                      Built-in Support
  
  ;; Enhancements:
--- 59,71 ----
  ;; Emacs "etc" directory.  It contains very helpful user information.
  
  ;; The EDT emulation consists of the following files:
! ;;
  ;; edt-user.doc     - User Instructions and Sample Customization File
  ;; edt.el           - EDT Emulation Functions and Default Configuration
  ;; edt-lk201.el     - Built-in support for DEC LK-201 Keyboards
  ;; edt-vt100.el     - Built-in support for DEC VT-100 (and above) terminals
  ;; edt-pc.el        - Built-in support for PC 101 Keyboards under MS-DOS
! ;; edt-mapper.el    - Create an EDT LK-201 Map File for Keyboards Without
  ;;                      Built-in Support
  
  ;; Enhancements:
***************
*** 81,87 ****
  ;;      following line
  ;;
  ;;           (edt-set-scroll-margins "20%" "25%")
! ;;      
  ;;      sets the top margin to 20% of the window and the bottom margin
  ;;      to 25% of the window.  To disable this feature, set each
  ;;      margin to 0%.  You can also invoke edt-set-scroll-margins
--- 81,87 ----
  ;;      following line
  ;;
  ;;           (edt-set-scroll-margins "20%" "25%")
! ;;
  ;;      sets the top margin to 20% of the window and the bottom margin
  ;;      to 25% of the window.  To disable this feature, set each
  ;;      margin to 0%.  You can also invoke edt-set-scroll-margins
***************
*** 91,103 ****
  ;;      NOTE: Another way to set the scroll margins is to use the
  ;;      Emacs customization feature (not available in Emacs 19) to set
  ;;      the following two variables directly:
! ;;      
  ;;           edt-top-scroll-margin and edt-bottom-scroll-margin
  ;;
  ;;      Enter the Emacs `customize' command.  First select the Editing
  ;;      group and then select the Emulations group.  Finally, select
  ;;      the Edt group and follow the directions.
! ;;      
  ;;  2.  The SUBS command is now supported and bound to GOLD-Enter by
  ;;      default.  (This design was copied from tpu-edt.el.)  Note, in
  ;;      earlier versions of EDT Emulation, GOLD-Enter was assigned to
--- 91,103 ----
  ;;      NOTE: Another way to set the scroll margins is to use the
  ;;      Emacs customization feature (not available in Emacs 19) to set
  ;;      the following two variables directly:
! ;;
  ;;           edt-top-scroll-margin and edt-bottom-scroll-margin
  ;;
  ;;      Enter the Emacs `customize' command.  First select the Editing
  ;;      group and then select the Emulations group.  Finally, select
  ;;      the Edt group and follow the directions.
! ;;
  ;;  2.  The SUBS command is now supported and bound to GOLD-Enter by
  ;;      default.  (This design was copied from tpu-edt.el.)  Note, in
  ;;      earlier versions of EDT Emulation, GOLD-Enter was assigned to
***************
*** 149,157 ****
  
  
  ;;; History:
! ;; 
  ;;  Version 4.0    2000    Added New Features and Fixed a Few Bugs
! ;;  
  
  
  ;;; Code:
--- 149,157 ----
  
  
  ;;; History:
! ;;
  ;;  Version 4.0    2000    Added New Features and Fixed a Few Bugs
! ;;
  
  
  ;;; Code:
***************
*** 198,204 ****
  is restored when edt-emulation-off is called."
    :type 'boolean
    :group 'edt)
!       
  (defcustom edt-use-EDT-control-key-bindings nil
    "*Emacs MUST be restarted for a change in value to take effect!
  Non-nil causes the control key bindings to be replaced with EDT
--- 198,204 ----
  is restored when edt-emulation-off is called."
    :type 'boolean
    :group 'edt)
! 
  (defcustom edt-use-EDT-control-key-bindings nil
    "*Emacs MUST be restarted for a change in value to take effect!
  Non-nil causes the control key bindings to be replaced with EDT
***************
*** 209,215 ****
    :group 'edt)
  
  (defcustom edt-word-entities '(?\t)
!   "*Specifies the list of EDT word entity characters.  
  The default list, (\?\\t), contains just the TAB character, which
  emulates EDT.  Characters are specified in the list using their
  decimal ASCII values.  A question mark, followed by the actual
--- 209,215 ----
    :group 'edt)
  
  (defcustom edt-word-entities '(?\t)
!   "*Specifies the list of EDT word entity characters.
  The default list, (\?\\t), contains just the TAB character, which
  emulates EDT.  Characters are specified in the list using their
  decimal ASCII values.  A question mark, followed by the actual
***************
*** 402,408 ****
  ;;; EDT defaults a section size to be 16 lines of its one and only
  ;;; 24-line window.  That's two-thirds of the window at a time.  The
  ;;; EDT SECT commands moves the cursor, not the window.
! ;;; 
  ;;; This emulation of EDT's SECT moves the cursor approximately
  ;;; two-thirds of the current window at a time.
  
--- 402,408 ----
  ;;; EDT defaults a section size to be 16 lines of its one and only
  ;;; 24-line window.  That's two-thirds of the window at a time.  The
  ;;; EDT SECT commands moves the cursor, not the window.
! ;;;
  ;;; This emulation of EDT's SECT moves the cursor approximately
  ;;; two-thirds of the current window at a time.
  
***************
*** 491,497 ****
  ;;; This one is a tad messy.  To emulate EDT's behavior everywhere in
  ;;; the file (beginning of file, end of file, beginning of line, end
  ;;; of line, etc.) it takes a bit of special handling.
! ;;; 
  ;;; The variable edt-word-entities contains a list of characters which
  ;;; are to be viewed as distinct words where ever they appear in the
  ;;; buffer.  This emulates the EDT line mode command SET ENTITY WORD.
--- 491,497 ----
  ;;; This one is a tad messy.  To emulate EDT's behavior everywhere in
  ;;; the file (beginning of file, end of file, beginning of line, end
  ;;; of line, etc.) it takes a bit of special handling.
! ;;;
  ;;; The variable edt-word-entities contains a list of characters which
  ;;; are to be viewed as distinct words where ever they appear in the
  ;;; buffer.  This emulates the EDT line mode command SET ENTITY WORD.
***************
*** 729,735 ****
    (if (equal edt-direction-string edt-forward-string)
        (edt-find-forward t)
        (edt-find-backward t)))
!   
  
  ;;;
  ;;; FNDNXT
--- 729,735 ----
    (if (equal edt-direction-string edt-forward-string)
        (edt-find-forward t)
        (edt-find-backward t)))
! 
  
  ;;;
  ;;; FNDNXT
***************
*** 798,804 ****
    (if (equal edt-direction-string edt-forward-string)
        (edt-find-next-forward)
      (edt-find-next-backward)))
!   
  ;;;
  ;;; APPEND
  ;;;
--- 798,804 ----
    (if (equal edt-direction-string edt-forward-string)
        (edt-find-next-forward)
      (edt-find-next-backward)))
! 
  ;;;
  ;;; APPEND
  ;;;
***************
*** 1008,1014 ****
  (defun edt-substitute (num)
    "Replace the selected region with the contents of the CUT buffer and.
  Repeat the most recent FIND command.  (The Emacs kill ring is used as
! the CUT buffer.)  
  Argument NUM is the repeat count.  A positive value indicates the of times
  to repeat the substitution.  A negative argument means replace all occurrences
  of the search text."
--- 1008,1014 ----
  (defun edt-substitute (num)
    "Replace the selected region with the contents of the CUT buffer and.
  Repeat the most recent FIND command.  (The Emacs kill ring is used as
! the CUT buffer.)
  Argument NUM is the repeat count.  A positive value indicates the of times
  to repeat the substitution.  A negative argument means replace all occurrences
  of the search text."
***************
*** 1087,1093 ****
        (exit-minibuffer))
    (if edt-x-emacs19-p (setq zmacs-region-stays t)))
  
!   
  ;;;
  ;;; BACKUP
  ;;;
--- 1087,1093 ----
        (exit-minibuffer))
    (if edt-x-emacs19-p (setq zmacs-region-stays t)))
  
! 
  ;;;
  ;;; BACKUP
  ;;;
***************
*** 1205,1211 ****
  Argument NUM is the prefix value tested."
    (if (<= num 0)
        (error "Prefix must be positive")))
!       
  ;;;
  ;;; Check Selection
  ;;;
--- 1205,1211 ----
  Argument NUM is the prefix value tested."
    (if (<= num 0)
        (error "Prefix must be positive")))
! 
  ;;;
  ;;; Check Selection
  ;;;
***************
*** 1277,1283 ****
  ;;;; ENHANCEMENTS AND ADDITIONS FOR EDT KEYPAD MODE
  ;;;;
  
! ;;; 
  ;;; Several enhancements and additions to EDT keypad mode commands are
  ;;; provided here.  Some of these have been motivated by similar
  ;;; TPU/EVE and EVE-Plus commands.  Others are new.
--- 1277,1283 ----
  ;;;; ENHANCEMENTS AND ADDITIONS FOR EDT KEYPAD MODE
  ;;;;
  
! ;;;
  ;;; Several enhancements and additions to EDT keypad mode commands are
  ;;; provided here.  Some of these have been motivated by similar
  ;;; TPU/EVE and EVE-Plus commands.  Others are new.
***************
*** 1818,1824 ****
    (save-buffer)
    (save-buffers-kill-emacs))
  
! ;;; 
  ;;; QUIT
  ;;;
  
--- 1818,1824 ----
    (save-buffer)
    (save-buffers-kill-emacs))
  
! ;;;
  ;;; QUIT
  ;;;
  
***************
*** 1836,1844 ****
                (kill-emacs)
              (setq working nil)))
        (setq list (cdr list))))
!     (if working (kill-emacs)))) 
  
! ;;; 
  ;;; SPLIT WINDOW
  ;;;
  
--- 1836,1844 ----
                (kill-emacs)
              (setq working nil)))
        (setq list (cdr list))))
!     (if working (kill-emacs))))
  
! ;;;
  ;;; SPLIT WINDOW
  ;;;
  
***************
*** 2024,2030 ****
  ;;;  Function used to load LK-201 key mapping file generated by edt-mapper.el.
  ;;;
  (defun edt-load-keys (file)
!   "Load the LK-201 key mapping FILE generated by edt-mapper.el.  
  If FILE is nil, which is the normal case, try to load a default file.
  The default file names are based upon the window system, terminal
  type, and version of Emacs in use: GNU Emacs or XEmacs (aka Lucid
--- 2024,2030 ----
  ;;;  Function used to load LK-201 key mapping file generated by edt-mapper.el.
  ;;;
  (defun edt-load-keys (file)
!   "Load the LK-201 key mapping FILE generated by edt-mapper.el.
  If FILE is nil, which is the normal case, try to load a default file.
  The default file names are based upon the window system, terminal
  type, and version of Emacs in use: GNU Emacs or XEmacs (aka Lucid
***************
*** 2042,2048 ****
                 "~/.edt-" edt-emacs-variant
                 (if edt-term (concat "-" edt-term))
                 (if edt-xserver (concat "-" edt-xserver))
!                (if edt-window-system 
                     (concat "-" (upcase (symbol-name edt-window-system))))
                 "-keys")))))
    (cond ((file-readable-p file)
--- 2042,2048 ----
                 "~/.edt-" edt-emacs-variant
                 (if edt-term (concat "-" edt-term))
                 (if edt-xserver (concat "-" edt-xserver))
!                (if edt-window-system
                     (concat "-" (upcase (symbol-name edt-window-system))))
                 "-keys")))))
    (cond ((file-readable-p file)
***************
*** 2053,2059 ****
         (insert "
  
       Ack!!  You're running the Enhanced EDT Emulation without loading an
!      EDT key mapping file.  To create an EDT key mapping file, run the 
       edt-mapper.el program.  It is safest to run it from an Emacs loaded
       without any of your own customizations found in your .emacs file, etc.
       The reason for this is that some user customizations confuse edt-mapper.
--- 2053,2059 ----
         (insert "
  
       Ack!!  You're running the Enhanced EDT Emulation without loading an
!      EDT key mapping file.  To create an EDT key mapping file, run the
       edt-mapper.el program.  It is safest to run it from an Emacs loaded
       without any of your own customizations found in your .emacs file, etc.
       The reason for this is that some user customizations confuse edt-mapper.
***************
*** 2061,2067 ****
       follows:
  
            emacs -q -l edt-mapper.el
!      
       [NOTE:  If you do nothing out of the ordinary in your .emacs file, and
       the search for edt-mapper.el is successful, you can try running it now.]
  
--- 2061,2067 ----
       follows:
  
            emacs -q -l edt-mapper.el
! 
       [NOTE:  If you do nothing out of the ordinary in your .emacs file, and
       the search for edt-mapper.el is successful, you can try running it now.]
  
***************
*** 2412,2418 ****
         'edt-key-not-assigned 'edt-key-not-assigned)
  
    ;; Control key bindings:  Regular and GOLD
!   ;; 
    ;; Standard EDT control key bindings conflict with standard Emacs
    ;; control key bindings.  Normally, the standard Emacs control key
    ;; bindings are left unchanged in the default EDT mode.  However, if
--- 2412,2418 ----
         'edt-key-not-assigned 'edt-key-not-assigned)
  
    ;; Control key bindings:  Regular and GOLD
!   ;;
    ;; Standard EDT control key bindings conflict with standard Emacs
    ;; control key bindings.  Normally, the standard Emacs control key
    ;; bindings are left unchanged in the default EDT mode.  However, if
***************
*** 2578,2584 ****
   G-F9: Paste Rect Insert          
+----------+----------+----------+----------+
    F10: Cut Rectangle
  G-F10: Paste Rectangle
!   F11: ESC                       
    F12: Begining of Line           
+----------+----------+----------+----------+
  G-F12: Delete Other Windows       |   GOLD   |   HELP   |  FNDNXT  |  DEL L   
|
    F13: Delete to Begin of Word    |   (PF1)  |   (PF2)  |   (PF3)  |  (PF4)   
|
--- 2578,2584 ----
   G-F9: Paste Rect Insert          
+----------+----------+----------+----------+
    F10: Cut Rectangle
  G-F10: Paste Rectangle
!   F11: ESC
    F12: Begining of Line           
+----------+----------+----------+----------+
  G-F12: Delete Other Windows       |   GOLD   |   HELP   |  FNDNXT  |  DEL L   
|
    F13: Delete to Begin of Word    |   (PF1)  |   (PF2)  |   (PF3)  |  (PF4)   
|
***************
*** 2600,2606 ****
    C-t: Display the Time           |         (0)         |    (.)   |   SUBS   
|
    C-u: Delete to Begin of Line    |      Open Line      |   RESET  |          
|
    C-v: Redraw Display             
+---------------------+----------+----------+
!   C-w: Set Screen Width 132       
    C-z: Suspend Emacs                    +----------+----------+----------+
  G-C-\\: Split Window                     |  FNDNXT  |   Yank   |   CUT    |
                                          |  (FIND)  | (INSERT) | (REMOVE) |
--- 2600,2606 ----
    C-t: Display the Time           |         (0)         |    (.)   |   SUBS   
|
    C-u: Delete to Begin of Line    |      Open Line      |   RESET  |          
|
    C-v: Redraw Display             
+---------------------+----------+----------+
!   C-w: Set Screen Width 132
    C-z: Suspend Emacs                    +----------+----------+----------+
  G-C-\\: Split Window                     |  FNDNXT  |   Yank   |   CUT    |
                                          |  (FIND)  | (INSERT) | (REMOVE) |
***************
*** 2610,2635 ****
    G-e: Exit                             | (SELECT) |(PREVIOUS)|  (NEXT)  |
    G-f: Find File                        |          |          |          |
    G-g: Find File Other Window           +----------+----------+----------+
!   G-h: Keypad Help             
!   G-i: Insert File                
!   G-k: Toggle Capitalization Word 
!   G-l: Downcase Region             
!   G-m: Save Some Buffers           
!   G-n: Next Error                  
    G-o: Switch to Next Window
!   G-q: Quit                                                           
!   G-r: Revert File                                                    
!   G-s: Save Buffer                                                    
!   G-u: Upcase Region                                                  
!   G-v: Find File Other Window                                        
!   G-w: Write file                                                  
!   G-y: EDT Emulation OFF          
    G-z: Switch to User EDT Key Bindings
!   G-1: Delete Other Windows       
!   G-2: Split Window               
!   G-%: Go to Percentage           
!   G- : Undo  (GOLD Spacebar)      
!   G-=: Go to Line                 
    G-`: What line
    G-/: Query-Replace"
  
--- 2610,2635 ----
    G-e: Exit                             | (SELECT) |(PREVIOUS)|  (NEXT)  |
    G-f: Find File                        |          |          |          |
    G-g: Find File Other Window           +----------+----------+----------+
!   G-h: Keypad Help
!   G-i: Insert File
!   G-k: Toggle Capitalization Word
!   G-l: Downcase Region
!   G-m: Save Some Buffers
!   G-n: Next Error
    G-o: Switch to Next Window
!   G-q: Quit
!   G-r: Revert File
!   G-s: Save Buffer
!   G-u: Upcase Region
!   G-v: Find File Other Window
!   G-w: Write file
!   G-y: EDT Emulation OFF
    G-z: Switch to User EDT Key Bindings
!   G-1: Delete Other Windows
!   G-2: Split Window
!   G-%: Go to Percentage
!   G- : Undo  (GOLD Spacebar)
!   G-=: Go to Line
    G-`: What line
    G-/: Query-Replace"