Merge from emacs--rel--22

[gnu-emacs] / lisp / emulation / ws-mode.el

diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index 29158dbf174427d0d62a35abdc82cac45e94f98a..d8a2fa2a80ffa28a585beb6b73324430753a8a55 100644 (file)
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -1,6 +1,7 @@
 ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs
 
-;; Copyright (C) 1991 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de>
 ;; Version: 0.7
@@ -8,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -42,7 +41,7 @@
   (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,9 +67,9 @@
   (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,11 +115,11 @@
   (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,7 +140,7 @@
   (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)
@@ -293,7 +292,8 @@ The key bindings are:
   (kill-all-local-variables)
   (use-local-map wordstar-mode-map)
   (setq mode-name "WordStar")
-  (setq major-mode 'wordstar-mode))
+  (setq major-mode 'wordstar-mode)
+  (run-mode-hooks 'wordstar-mode-hook))
 
 
 (defun wordstar-center-paragraph ()
@@ -335,8 +335,8 @@ the distance between the end of the text and `fill-column'."
       (delete-horizontal-space)
       (setq line-length (current-column))
       (beginning-of-line)
-      (indent-to 
-       (+ left-margin 
+      (indent-to
+       (+ left-margin
          (/ (- fill-column left-margin line-length) 2))))))
 
 (defun scroll-down-line ()
@@ -367,13 +367,13 @@ the distance between the end of the text and `fill-column'."
 (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-search-direction t
+  "Direction of last search in WordStar mode. t if forward, nil if backward.")
 
-(defvar ws-last-cursorposition nil 
+(defvar ws-last-cursorposition nil
   "Position before last search etc. in WordStar mode.")
 
-(defvar ws-last-errormessage nil 
+(defvar ws-last-errormessage nil
   "Last error message issued by a WordStar mode function.")
 
 ;;;;;;;;;;;
@@ -509,7 +509,7 @@ in ws-last-errormessage for recovery with C-q w."
   "In WordStar mode: Move block to current cursor position."
   (interactive)
   (if (and ws-block-begin-marker ws-block-end-marker)
-      (let () 
+      (let ()
        (kill-region ws-block-begin-marker ws-block-end-marker)
        (yank)
        (save-excursion
@@ -690,7 +690,7 @@ in ws-last-errormessage for recovery with C-q w."
 This will only work for errors raised by WordStar mode functions."
   (interactive)
   (if ws-last-errormessage
-      (message ws-last-errormessage)
+      (message "%s" ws-last-errormessage)
     (message "No WordStar error yet.")))
 
 (defun ws-kill-eol ()
@@ -701,7 +701,7 @@ This will only work for errors raised by WordStar mode functions."
     (kill-region p (point))))
 
 (defun ws-kill-bol ()
-  "In WordStar mode: Kill to beginning of line 
+  "In WordStar mode: Kill to beginning of line
 \(like WordStar, not like Emacs)."
   (interactive)
   (let ((p (point)))
@@ -729,7 +729,7 @@ This will only work for errors raised by WordStar mode functions."
 
 (defun ws-query-replace (from to)
   "In WordStar mode: Search string, remember string for repetition."
-  (interactive "sReplace: 
+  (interactive "sReplace:
 sWith: " )
   (setq ws-search-string from)
   (setq ws-search-direction t)
@@ -754,4 +754,5 @@ sWith: " )
 
 (provide 'ws-mode)
 
+;; arch-tag: 6dd864bf-2ccb-4d59-af6e-492eba2890a3
 ;;; ws-mode.el ends here