Some hi-lock doc

[gnu-emacs] / lisp / delsel.el

diff --git a/lisp/delsel.el b/lisp/delsel.el
index 87e84e59dee2ff7d86ba501fdc081d5c0c81dbb1..5c3d638f16c75617ccab0bb89eeac4144f404683 100644 (file)
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -1,6 +1,6 @@
 ;;; delsel.el --- delete selection if you insert
 
 ;;; delsel.el --- delete selection if you insert
 

-;; Copyright (C) 1992, 1997-1998, 2001-2013 Free Software Foundation,
+;; Copyright (C) 1992, 1997-1998, 2001-2014 Free Software Foundation,

 ;; Inc.
 
 ;; Author: Matthieu Devin <devin@lucid.com>
 ;; Inc.
 
 ;; Author: Matthieu Devin <devin@lucid.com>


@@ -49,7 +49,7 @@
 ;;      The normal case: delete the active region prior to executing
 ;;      the command which will insert replacement text.
 ;;  <function>
 ;;      The normal case: delete the active region prior to executing
 ;;      the command which will insert replacement text.
 ;;  <function>

-;;      For commands which need to dynamically determine this behaviour.
+;;      For commands which need to dynamically determine this behavior.

 ;;      The function should return one of the above values or nil.
 
 ;;; Code:
 ;;      The function should return one of the above values or nil.
 
 ;;; Code:


@@ -64,10 +64,9 @@ With a prefix argument ARG, enable Delete Selection mode if ARG
 is positive, and disable it otherwise.  If called from Lisp,
 enable the mode if ARG is omitted or nil.
 
 is positive, and disable it otherwise.  If called from Lisp,
 enable the mode if ARG is omitted or nil.
 

-When Delete Selection mode is enabled, Transient Mark mode is also
-enabled and typed text replaces the selection if the selection is
-active.  Otherwise, typed text is just inserted at point regardless of
-any selection."
+When Delete Selection mode is enabled, typed text replaces the selection
+if the selection is active.  Otherwise, typed text is just inserted at
+point regardless of any selection."

   :global t :group 'editing-basics
   (if (not delete-selection-mode)
       (remove-hook 'pre-command-hook 'delete-selection-pre-hook)
   :global t :group 'editing-basics
   (if (not delete-selection-mode)
       (remove-hook 'pre-command-hook 'delete-selection-pre-hook)


@@ -99,7 +98,7 @@ If KILLP in not-nil, the active region is killed instead of deleted."
      The normal case: delete the active region prior to executing
      the command which will insert replacement text.
  FUNCTION
      The normal case: delete the active region prior to executing
      the command which will insert replacement text.
  FUNCTION

-     For commands which need to dynamically determine this behaviour.
+     For commands which need to dynamically determine this behavior.

      FUNCTION should take no argument and return one of the above values or nil."
   (condition-case data
       (cond ((eq type 'kill)
      FUNCTION should take no argument and return one of the above values or nil."
   (condition-case data
       (cond ((eq type 'kill)