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

[Juanma Barranquero]

Index: emacs/lisp/emulation/ws-mode.el
diff -c emacs/lisp/emulation/ws-mode.el:1.19 
emacs/lisp/emulation/ws-mode.el:1.20
*** emacs/lisp/emulation/ws-mode.el:1.19        Thu Dec 20 13:54:45 2001
--- emacs/lisp/emulation/ws-mode.el     Tue Feb  4 07:56:03 2003
***************
*** 42,48 ****
    (setq wordstar-C-k-map (make-keymap))
    (setq wordstar-C-o-map (make-keymap))
    (setq wordstar-C-q-map (make-keymap))
!   
    (define-key wordstar-mode-map "\C-a" 'backward-word)
    (define-key wordstar-mode-map "\C-b" 'fill-paragraph)
    (define-key wordstar-mode-map "\C-c" 'scroll-up)
--- 42,48 ----
    (setq wordstar-C-k-map (make-keymap))
    (setq wordstar-C-o-map (make-keymap))
    (setq wordstar-C-q-map (make-keymap))
! 
    (define-key wordstar-mode-map "\C-a" 'backward-word)
    (define-key wordstar-mode-map "\C-b" 'fill-paragraph)
    (define-key wordstar-mode-map "\C-c" 'scroll-up)
***************
*** 68,76 ****
    (define-key wordstar-mode-map "\C-x" 'next-line)
    (define-key wordstar-mode-map "\C-y" 'kill-complete-line)
    (define-key wordstar-mode-map "\C-z" 'scroll-up-line)
!   
    ;; wordstar-C-k-map
!   
    (define-key wordstar-C-k-map " " ())
    (define-key wordstar-C-k-map "0" 'ws-set-marker-0)
    (define-key wordstar-C-k-map "1" 'ws-set-marker-1)
--- 68,76 ----
    (define-key wordstar-mode-map "\C-x" 'next-line)
    (define-key wordstar-mode-map "\C-y" 'kill-complete-line)
    (define-key wordstar-mode-map "\C-z" 'scroll-up-line)
! 
    ;; wordstar-C-k-map
! 
    (define-key wordstar-C-k-map " " ())
    (define-key wordstar-C-k-map "0" 'ws-set-marker-0)
    (define-key wordstar-C-k-map "1" 'ws-set-marker-1)
***************
*** 116,126 ****
    (define-key wordstar-C-k-map "\C-x" 'save-buffers-kill-emacs)
    (define-key wordstar-C-k-map "y" 'ws-delete-block)
    (define-key wordstar-C-k-map "\C-y" 'ws-delete-block)
!   
    ;; wordstar-C-j-map not yet implemented
!   
    ;; wordstar-C-o-map
!   
    (define-key wordstar-C-o-map " " ())
    (define-key wordstar-C-o-map "c" 'wordstar-center-line)
    (define-key wordstar-C-o-map "\C-c" 'wordstar-center-line)
--- 116,126 ----
    (define-key wordstar-C-k-map "\C-x" 'save-buffers-kill-emacs)
    (define-key wordstar-C-k-map "y" 'ws-delete-block)
    (define-key wordstar-C-k-map "\C-y" 'ws-delete-block)
! 
    ;; wordstar-C-j-map not yet implemented
! 
    ;; wordstar-C-o-map
! 
    (define-key wordstar-C-o-map " " ())
    (define-key wordstar-C-o-map "c" 'wordstar-center-line)
    (define-key wordstar-C-o-map "\C-c" 'wordstar-center-line)
***************
*** 141,147 ****
    (define-key wordstar-C-o-map "wh" 'split-window-horizontally)
    (define-key wordstar-C-o-map "wo" 'other-window)
    (define-key wordstar-C-o-map "wv" 'split-window-vertically)
!   
    ;; wordstar-C-q-map
    (define-key wordstar-C-q-map " " ())
    (define-key wordstar-C-q-map "0" 'ws-find-marker-0)
--- 141,147 ----
    (define-key wordstar-C-o-map "wh" 'split-window-horizontally)
    (define-key wordstar-C-o-map "wo" 'other-window)
    (define-key wordstar-C-o-map "wv" 'split-window-vertically)
! 
    ;; wordstar-C-q-map
    (define-key wordstar-C-q-map " " ())
    (define-key wordstar-C-q-map "0" 'ws-find-marker-0)
***************
*** 336,343 ****
        (delete-horizontal-space)
        (setq line-length (current-column))
        (beginning-of-line)
!       (indent-to 
!        (+ left-margin 
          (/ (- fill-column left-margin line-length) 2))))))
  
  (defun scroll-down-line ()
--- 336,343 ----
        (delete-horizontal-space)
        (setq line-length (current-column))
        (beginning-of-line)
!       (indent-to
!        (+ left-margin
          (/ (- fill-column left-margin line-length) 2))))))
  
  (defun scroll-down-line ()
***************
*** 368,380 ****
  (defvar ws-block-end-marker nil "End of \"Block\" in WordStar mode.")
  
  (defvar ws-search-string nil "String of last search in WordStar mode.")
! (defvar ws-search-direction t 
    "Direction of last search in WordStar mode. t if forward, nil if backward.")
  
! (defvar ws-last-cursorposition nil 
    "Position before last search etc. in WordStar mode.")
  
! (defvar ws-last-errormessage nil 
    "Last error message issued by a WordStar mode function.")
  
  ;;;;;;;;;;;
--- 368,380 ----
  (defvar ws-block-end-marker nil "End of \"Block\" in WordStar mode.")
  
  (defvar ws-search-string nil "String of last search in WordStar mode.")
! (defvar ws-search-direction t
    "Direction of last search in WordStar mode. t if forward, nil if backward.")
  
! (defvar ws-last-cursorposition nil
    "Position before last search etc. in WordStar mode.")
  
! (defvar ws-last-errormessage nil
    "Last error message issued by a WordStar mode function.")
  
  ;;;;;;;;;;;
***************
*** 510,516 ****
    "In WordStar mode: Move block to current cursor position."
    (interactive)
    (if (and ws-block-begin-marker ws-block-end-marker)
!       (let () 
        (kill-region ws-block-begin-marker ws-block-end-marker)
        (yank)
        (save-excursion
--- 510,516 ----
    "In WordStar mode: Move block to current cursor position."
    (interactive)
    (if (and ws-block-begin-marker ws-block-end-marker)
!       (let ()
        (kill-region ws-block-begin-marker ws-block-end-marker)
        (yank)
        (save-excursion
***************
*** 702,708 ****
      (kill-region p (point))))
  
  (defun ws-kill-bol ()
!   "In WordStar mode: Kill to beginning of line 
  \(like WordStar, not like Emacs)."
    (interactive)
    (let ((p (point)))
--- 702,708 ----
      (kill-region p (point))))
  
  (defun ws-kill-bol ()
!   "In WordStar mode: Kill to beginning of line
  \(like WordStar, not like Emacs)."
    (interactive)
    (let ((p (point)))
***************
*** 730,736 ****
  
  (defun ws-query-replace (from to)
    "In WordStar mode: Search string, remember string for repetition."
!   (interactive "sReplace: 
  sWith: " )
    (setq ws-search-string from)
    (setq ws-search-direction t)
--- 730,736 ----
  
  (defun ws-query-replace (from to)
    "In WordStar mode: Search string, remember string for repetition."
!   (interactive "sReplace:
  sWith: " )
    (setq ws-search-string from)
    (setq ws-search-direction t)