HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spelling fixes.
[bpt/emacs.git]
/
lisp
/
delsel.el
diff --git
a/lisp/delsel.el
b/lisp/delsel.el
index
cb5f1c4
..
fcd45f1
100644
(file)
--- a/
lisp/delsel.el
+++ b/
lisp/delsel.el
@@
-1,7
+1,6
@@
;;; delsel.el --- delete selection if you insert
;;; delsel.el --- delete selection if you insert
-;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1997-1998, 2001-2011 Free Software Foundation, Inc.
;; Author: Matthieu Devin <devin@lucid.com>
;; Maintainer: FSF
;; Author: Matthieu Devin <devin@lucid.com>
;; Maintainer: FSF
@@
-57,8
+56,9
@@
;;;###autoload
(define-minor-mode delete-selection-mode
"Toggle Delete Selection mode.
;;;###autoload
(define-minor-mode delete-selection-mode
"Toggle Delete Selection mode.
-With prefix ARG, turn Delete Selection mode on if ARG is
-positive, off if ARG is not positive.
+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.
When Delete Selection mode is enabled, Transient Mark mode is also
enabled and typed text replaces the selection if the selection is
When Delete Selection mode is enabled, Transient Mark mode is also
enabled and typed text replaces the selection if the selection is
@@
-144,7
+144,7
@@
any selection."
(put 'newline 'delete-selection t)
(put 'open-line 'delete-selection 'kill)
(put 'newline 'delete-selection t)
(put 'open-line 'delete-selection 'kill)
-;; This is very useful for cancel
l
ing a selection in the minibuffer without
+;; This is very useful for canceling a selection in the minibuffer without
;; aborting the minibuffer.
(defun minibuffer-keyboard-quit ()
"Abort recursive edit.
;; aborting the minibuffer.
(defun minibuffer-keyboard-quit ()
"Abort recursive edit.
@@
-177,5
+177,4
@@
then it takes a second \\[keyboard-quit] to abort the minibuffer."
(provide 'delsel)
(provide 'delsel)
-;; arch-tag: 1e388890-1b50-4ed0-9347-763b1343b6ed
;;; delsel.el ends here
;;; delsel.el ends here