annotate lisp/delsel.el @ 110523:a5ad4f188e19

Synch Semantic to CEDET 1.0. Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog. * semantic.el (semantic-version): Update to 2.0. (semantic-mode-map): Add "," and "m" bindings. (navigate-menu): Update. * semantic/symref.el (semantic-symref-calculate-rootdir): New function. (semantic-symref-detect-symref-tool): Use it. * semantic/symref/grep.el (semantic-symref-grep-shell): New var. (semantic-symref-perform-search): Use it. Calculate root dir with semantic-symref-calculate-rootdir. (semantic-symref-derive-find-filepatterns): Improve error message. * semantic/symref/list.el (semantic-symref-results-mode-map): New bindings. (semantic-symref-auto-expand-results): New option. (semantic-symref-results-dump): Obey auto-expand. (semantic-symref-list-expand-all, semantic-symref-regexp) (semantic-symref-list-contract-all) (semantic-symref-list-map-open-hits) (semantic-symref-list-update-open-hits) (semantic-symref-list-create-macro-on-open-hit) (semantic-symref-list-call-macro-on-open-hits): New functions. (semantic-symref-list-menu-entries) (semantic-symref-list-menu): New vars. (semantic-symref-list-map-open-hits): Move cursor to beginning of match before calling the mapped function. * semantic/doc.el (semantic-documentation-comment-preceeding-tag): Do nothing if the mode doesn't provide comment-start-skip. * semantic/scope.el (semantic-analyze-scope-nested-tags-default): Strip duplicates. (semantic-analyze-scoped-inherited-tag-map): Take the tag we are looking for as part of the scoped tags list. * semantic/html.el (semantic-default-html-setup): Add senator-step-at-tag-classes. * semantic/decorate/include.el (semantic-decoration-on-unknown-includes): Change light bgcolor. (semantic-decoration-on-includes-highlight-default): Check that the include tag has a postion. * semantic/complete.el (semantic-collector-local-members): (semantic-complete-read-tag-local-members) (semantic-complete-jump-local-members): New class and functions. (semantic-complete-self-insert): Save excursion before completing. * semantic/analyze/complete.el (semantic-analyze-possible-completions-default): If no completions are found, return the raw by-name-only completion list. Add FLAGS arguments. Add support for 'no-tc (type constraint) and 'no-unique, or no stripping duplicates. (semantic-analyze-possible-completions-default): Add FLAGS arg. * semantic/util-modes.el (semantic-stickyfunc-show-only-functions-p): New option. (semantic-stickyfunc-fetch-stickyline): Don't show stickytext for the very first line in a buffer. * semantic/util.el (semantic-hack-search) (semantic-recursive-find-nonterminal-by-name) (semantic-current-tag-interactive): Deleted. (semantic-describe-buffer): Fix expand-nonterminal. Add lex-syntax-mods, type relation separator char, and command separation char. (semantic-sanity-check): Only message if called interactively. * semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the :filename property and the tag position. * semantic/lex-spp.el (semantic-lex-spp-lex-text-string): Add recursion limit. * semantic/imenu.el (semantic-imenu-bucketize-type-members): Make this buffer local, not the obsoleted variable. * semantic/idle.el: Add breadcrumbs support. (semantic-idle-summary-current-symbol-info-default) (semantic-idle-tag-highlight) (semantic-idle-completion-list-default): Use semanticdb-without-unloaded-file-searches for speed, and to conform to the controls that specify if the idle timer is supposed to be parsing unparsed includes. (semantic-idle-symbol-highlight-face) (semantic-idle-symbol-maybe-highlight): Rename from *-summary-*. Callers changed. (semantic-idle-work-parse-neighboring-files-flag): Default to nil. (semantic-idle-work-update-headers-flag): New var. (semantic-idle-work-for-one-buffer): Use it. (semantic-idle-local-symbol-highlight): Rename from semantic-idle-tag-highlight. (semantic-idle-truncate-long-summaries): New option. * semantic/ia.el (semantic-ia-cache) (semantic-ia-get-completions): Deleted. Callers changed. (semantic-ia-show-variants): New command. (semantic-ia-show-doc): If doc is empty, don't make a temp buffer. (semantic-ia-show-summary): If there isn't anything to show, say so. * semantic/grammar.el (semantic-grammar-create-package): Save the buffer even in batch mode. * semantic/fw.el (semanticdb-without-unloaded-file-searches): New macro. * semantic/dep.el (semantic-dependency-find-file-on-path): Fix case dereferencing ede-object when it is a list. * semantic/db-typecache.el (semanticdb-expand-nested-tag) (semanticdb-typecache-faux-namespace): New functions. (semanticdb-typecache-file-tags) (semanticdb-typecache-merge-streams): Use them. (semanticdb-typecache-file-tags): When deriving tags from a file, give the mode a chance to monkey with the tag copy. (semanticdb-typecache-find-default): Wrap find in save-excursion. (semanticdb-typecache-find-by-name-helper): Merge found names down. * semantic/db-global.el (semanticdb-enable-gnu-global-in-buffer): Don't show messages if GNU Global is not available and we don't want to throw an error. * semantic/db-find.el (semanticdb-find-result-nth-in-buffer): When trying to normalize the tag to a buffer, don't error if set-buffer method doesn't exist. * semantic/db-file.el (semanticdb-save-db): Simplify msg. * semantic/db.el (semanticdb-refresh-table): If forcing a refresh on a file not in a buffer, use semantic-find-file-noselect and delete the buffer after use. (semanticdb-current-database-list): When calculating root via hooks, force it through true-filename and skip the list of possible roots. * semantic/ctxt.el (semantic-ctxt-imported-packages): New. * semantic/analyze/debug.el (semantic-analyzer-debug-insert-tag): Reset standard output to current buffer. (semantic-analyzer-debug-global-symbol) (semantic-analyzer-debug-missing-innertype): Change "prefix" to "symbol" in messages. * semantic/analyze/refs.el: (semantic-analyze-refs-impl) (semantic-analyze-refs-proto): When calculating value, make sure the found tag is 'similar' to the originating tag. (semantic--analyze-refs-find-tags-with-parent): Attempt to identify matches via imported symbols of parents. (semantic--analyze-refs-full-lookup-with-parents): Do a deep search during the brute search. * semantic/analyze.el (semantic-analyze-find-tag-sequence-default): Be robust to calculated scopes being nil. * semantic/bovine/c.el (semantic-c-describe-environment): Add project macro symbol array. (semantic-c-parse-lexical-token): Add recursion limit. (semantic-ctxt-imported-packages, semanticdb-expand-nested-tag): New overrides. (semantic-expand-c-tag-namelist): Split a full type from a typedef out to its own tag. (semantic-expand-c-tag-namelist): Do not split out a typedef'd inline type if it is an anonymous type. (semantic-c-reconstitute-token): Use the optional initializers as a clue that some function is probably a constructor. When defining the type of these constructors, split the parent name, and use only the class part, if applicable. * semantic/bovine/c-by.el: * semantic/wisent/python-wy.el: Regenerate.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 18 Sep 2010 22:49:54 -0400
parents 1d1d5d9bd884
children 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2903
fa41174db2fa Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents: 2233
diff changeset
1 ;;; delsel.el --- delete selection if you insert
2233
fb0ed5a1d0f3 Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2074
diff changeset
2
64762
41bb365f41c4 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64091
diff changeset
3 ;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
2233
fb0ed5a1d0f3 Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2074
diff changeset
5
fb0ed5a1d0f3 Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2074
diff changeset
6 ;; Author: Matthieu Devin <devin@lucid.com>
17976
852464ce5d6a Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
7 ;; Maintainer: FSF
2233
fb0ed5a1d0f3 Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2074
diff changeset
8 ;; Created: 14 Jul 92
29156
af5c31a82586 Add finder keywords.
Dave Love <fx@gnu.org>
parents: 26705
diff changeset
9 ;; Keywords: convenience emulations
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
11 ;; This file is part of GNU Emacs.
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
13 ;; GNU Emacs is free software: you can redistribute it and/or modify
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
14 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
15 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
16 ;; (at your option) any later version.
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
18 ;; GNU Emacs is distributed in the hope that it will be useful,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
21 ;; GNU General Public License for more details.
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
23 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25
2233
fb0ed5a1d0f3 Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2074
diff changeset
26 ;;; Commentary:
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
28 ;; This file makes the active region be pending delete, meaning that
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
29 ;; text inserted while the region is active will replace the region contents.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13077
diff changeset
30 ;; This is a popular behavior of personal computers text editors.
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
31
21720
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
32 ;; Interface:
2233
fb0ed5a1d0f3 Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2074
diff changeset
33
21720
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
34 ;; Commands which will delete the selection need a 'delete-selection
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
35 ;; property on their symbols; commands which insert text but don't
85811
cd42bdedadb3 (delsel-unload-hook): Remove function and variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 85073
diff changeset
36 ;; have this property won't delete the selection. It can be one of
21720
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
37 ;; the values:
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
38 ;; 'yank
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
39 ;; For commands which do a yank; ensures the region about to be
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
40 ;; deleted isn't yanked.
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
41 ;; 'supersede
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
42 ;; Delete the active region and ignore the current command,
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
43 ;; i.e. the command will just delete the region.
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
44 ;; 'kill
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
45 ;; `kill-region' is used on the selection, rather than
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
46 ;; `delete-region'. (Text selected with the mouse will typically
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
47 ;; be yankable anyhow.)
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
48 ;; non-nil
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
49 ;; The normal case: delete the active region prior to executing
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
50 ;; the command which will insert replacement text.
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
51
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
52 ;;; Code:
18785
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
53
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
54 ;;;###autoload
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
55 (defalias 'pending-delete-mode 'delete-selection-mode)
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
56
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
57 ;;;###autoload
32043
63a2ec6dae39 (delete-selection-mode): Use define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30817
diff changeset
58 (define-minor-mode delete-selection-mode
18785
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
59 "Toggle Delete Selection mode.
79678
08240fd93b4f (delete-selection-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 78236
diff changeset
60 With prefix ARG, turn Delete Selection mode on if ARG is
08240fd93b4f (delete-selection-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 78236
diff changeset
61 positive, off if ARG is not positive.
18785
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
62
21720
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
63 When Delete Selection mode is enabled, Transient Mark mode is also
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
64 enabled and typed text replaces the selection if the selection is
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
65 active. Otherwise, typed text is just inserted at point regardless of
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
66 any selection."
33185
7630435cbccd (delete-selection-mode): Drop unneeded positional args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32043
diff changeset
67 :global t :group 'editing-basics
18785
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
68 (if (not delete-selection-mode)
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
69 (remove-hook 'pre-command-hook 'delete-selection-pre-hook)
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
70 (add-hook 'pre-command-hook 'delete-selection-pre-hook)
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
71 (transient-mark-mode t)))
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
72
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
73 (defun delete-active-region (&optional killp)
2074
0196b8bce529 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 2073
diff changeset
74 (if killp
0196b8bce529 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 2073
diff changeset
75 (kill-region (point) (mark))
0196b8bce529 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 2073
diff changeset
76 (delete-region (point) (mark)))
0196b8bce529 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 2073
diff changeset
77 t)
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
78
2903
fa41174db2fa Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents: 2233
diff changeset
79 (defun delete-selection-pre-hook ()
18785
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
80 (when (and delete-selection-mode transient-mark-mode mark-active
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
81 (not buffer-read-only))
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
82 (let ((type (and (symbolp this-command)
1a455d8dfa7c Customise. Don't modify pre-command-hook on file load; do in command.
Simon Marshall <simon@gnu.org>
parents: 18641
diff changeset
83 (get this-command 'delete-selection))))
41254
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
84 (condition-case data
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
85 (cond ((eq type 'kill)
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
86 (delete-active-region t))
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
87 ((eq type 'yank)
81894
fb5c5d1a8fe2 (delete-selection-pre-hook): Before a yank command,
Juri Linkov <juri@jurta.org>
parents: 75347
diff changeset
88 ;; Before a yank command, make sure we don't yank the
fb5c5d1a8fe2 (delete-selection-pre-hook): Before a yank command,
Juri Linkov <juri@jurta.org>
parents: 75347
diff changeset
89 ;; head of the kill-ring that really comes from the
82507
9c9e50cbdf1e (delete-selection-pre-hook): Use `mouse-region-match' instead of checking last-command.
Juri Linkov <juri@jurta.org>
parents: 82140
diff changeset
90 ;; currently active region we are going to delete.
41254
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
91 ;; That would make yank a no-op.
81894
fb5c5d1a8fe2 (delete-selection-pre-hook): Before a yank command,
Juri Linkov <juri@jurta.org>
parents: 75347
diff changeset
92 (when (and (string= (buffer-substring-no-properties (point) (mark))
fb5c5d1a8fe2 (delete-selection-pre-hook): Before a yank command,
Juri Linkov <juri@jurta.org>
parents: 75347
diff changeset
93 (car kill-ring))
85073
6ae29c2dfff0 (delete-selection-pre-hook): Check if mouse-region-match is fbound
Juri Linkov <juri@jurta.org>
parents: 82507
diff changeset
94 (fboundp 'mouse-region-match)
82507
9c9e50cbdf1e (delete-selection-pre-hook): Use `mouse-region-match' instead of checking last-command.
Juri Linkov <juri@jurta.org>
parents: 82140
diff changeset
95 (mouse-region-match))
41254
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
96 (current-kill 1))
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
97 (delete-active-region))
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
98 ((eq type 'supersede)
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
99 (let ((empty-region (= (point) (mark))))
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
100 (delete-active-region)
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
101 (unless empty-region
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
102 (setq this-command 'ignore))))
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
103 (type
64947
803494c7e4b7 (delete-selection-pre-hook): If overwrite-mode is
Juri Linkov <juri@jurta.org>
parents: 64762
diff changeset
104 (delete-active-region)
803494c7e4b7 (delete-selection-pre-hook): If overwrite-mode is
Juri Linkov <juri@jurta.org>
parents: 64762
diff changeset
105 (if (and overwrite-mode (eq this-command 'self-insert-command))
803494c7e4b7 (delete-selection-pre-hook): If overwrite-mode is
Juri Linkov <juri@jurta.org>
parents: 64762
diff changeset
106 (let ((overwrite-mode nil))
803494c7e4b7 (delete-selection-pre-hook): If overwrite-mode is
Juri Linkov <juri@jurta.org>
parents: 64762
diff changeset
107 (self-insert-command (prefix-numeric-value current-prefix-arg))
803494c7e4b7 (delete-selection-pre-hook): If overwrite-mode is
Juri Linkov <juri@jurta.org>
parents: 64762
diff changeset
108 (setq this-command 'ignore)))))
41254
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
109 (file-supersession
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
110 ;; If ask-user-about-supersession-threat signals an error,
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
111 ;; stop safe_run_hooks from clearing out pre-command-hook.
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
112 (and (eq inhibit-quit 'pre-command-hook)
2538b11fc837 (delete-selection-pre-hook): Handle and resignal
Richard M. Stallman <rms@gnu.org>
parents: 38616
diff changeset
113 (setq inhibit-quit 'delete-selection-dummy))
87933
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
114 (signal 'file-supersession (cdr data)))
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
115 (text-read-only
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
116 ;; This signal may come either from `delete-active-region' or
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
117 ;; `self-insert-command' (when `overwrite-mode' is non-nil).
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
118 ;; To avoid clearing out `pre-command-hook' we handle this case
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
119 ;; by issuing a simple message. Note, however, that we do not
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
120 ;; handle all related problems: When read-only text ends before
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
121 ;; the end of the region, the latter is not deleted but any
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
122 ;; subsequent insertion will succeed. We could avoid this case
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
123 ;; by doing a (setq this-command 'ignore) here. This would,
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
124 ;; however, still not handle the case where read-only text ends
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
125 ;; precisely where the region starts: In that case the deletion
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
126 ;; would succeed but the subsequent insertion would fail with a
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
127 ;; text-read-only error. To handle that case we would have to
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
128 ;; investigate text properties at both ends of the region and
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
129 ;; skip the deletion when inserting text is forbidden there.
1c868d4c8354 (delete-selection-pre-hook): Avoid clearing out
Martin Rudalics <rudalics@gmx.at>
parents: 87649
diff changeset
130 (message "Text is read-only") (ding))))))
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
131
2903
fa41174db2fa Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents: 2233
diff changeset
132 (put 'self-insert-command 'delete-selection t)
9533
b589ba0d8960 (self-insert-iso): Add delete-selection property.
Richard M. Stallman <rms@gnu.org>
parents: 2925
diff changeset
133 (put 'self-insert-iso 'delete-selection t)
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
134
12790
afe7f3c735a3 (delete-selection-pre-hook): New type value `yank'.
Richard M. Stallman <rms@gnu.org>
parents: 11589
diff changeset
135 (put 'yank 'delete-selection 'yank)
13077
65092cab3f43 (clipboard-yank): Add delete-selection property.
Richard M. Stallman <rms@gnu.org>
parents: 12790
diff changeset
136 (put 'clipboard-yank 'delete-selection 'yank)
2925
902c32c709f7 Provide delsel.
Richard M. Stallman <rms@gnu.org>
parents: 2903
diff changeset
137 (put 'insert-register 'delete-selection t)
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
138
2903
fa41174db2fa Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents: 2233
diff changeset
139 (put 'delete-backward-char 'delete-selection 'supersede)
fa41174db2fa Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents: 2233
diff changeset
140 (put 'backward-delete-char-untabify 'delete-selection 'supersede)
fa41174db2fa Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents: 2233
diff changeset
141 (put 'delete-char 'delete-selection 'supersede)
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
142
21720
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
143 (put 'newline-and-indent 'delete-selection t)
2903
fa41174db2fa Renamed from pending-del.el.
Richard M. Stallman <rms@gnu.org>
parents: 2233
diff changeset
144 (put 'newline 'delete-selection t)
21720
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
145 (put 'open-line 'delete-selection 'kill)
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
146
30817
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
147 ;; This is very useful for cancelling a selection in the minibuffer without
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
148 ;; aborting the minibuffer.
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
149 (defun minibuffer-keyboard-quit ()
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
150 "Abort recursive edit.
21720
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
151 In Delete Selection mode, if the mark is active, just deactivate it;
b1ee274d921b Don't require cl. Minor doc fixes.
Dave Love <fx@gnu.org>
parents: 19488
diff changeset
152 then it takes a second \\[keyboard-quit] to abort the minibuffer."
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
153 (interactive)
2925
902c32c709f7 Provide delsel.
Richard M. Stallman <rms@gnu.org>
parents: 2903
diff changeset
154 (if (and delete-selection-mode transient-mark-mode mark-active)
902c32c709f7 Provide delsel.
Richard M. Stallman <rms@gnu.org>
parents: 2903
diff changeset
155 (setq deactivate-mark t)
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
156 (abort-recursive-edit)))
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
157
30817
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
158 (define-key minibuffer-local-map "\C-g" 'minibuffer-keyboard-quit)
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
159 (define-key minibuffer-local-ns-map "\C-g" 'minibuffer-keyboard-quit)
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
160 (define-key minibuffer-local-completion-map "\C-g" 'minibuffer-keyboard-quit)
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
161 (define-key minibuffer-local-must-match-map "\C-g" 'minibuffer-keyboard-quit)
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
162 (define-key minibuffer-local-isearch-map "\C-g" 'minibuffer-keyboard-quit)
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
163
85811
cd42bdedadb3 (delsel-unload-hook): Remove function and variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 85073
diff changeset
164 (defun delsel-unload-function ()
cd42bdedadb3 (delsel-unload-hook): Remove function and variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 85073
diff changeset
165 "Unload the Delete Selection library."
30817
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
166 (define-key minibuffer-local-map "\C-g" 'abort-recursive-edit)
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
167 (define-key minibuffer-local-ns-map "\C-g" 'abort-recursive-edit)
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
168 (define-key minibuffer-local-completion-map "\C-g" 'abort-recursive-edit)
fd8b296712e7 (delsel-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 29156
diff changeset
169 (define-key minibuffer-local-must-match-map "\C-g" 'abort-recursive-edit)
85811
cd42bdedadb3 (delsel-unload-hook): Remove function and variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 85073
diff changeset
170 (define-key minibuffer-local-isearch-map "\C-g" 'abort-recursive-edit)
cd42bdedadb3 (delsel-unload-hook): Remove function and variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 85073
diff changeset
171 (dolist (sym '(self-insert-command self-insert-iso yank clipboard-yank
cd42bdedadb3 (delsel-unload-hook): Remove function and variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 85073
diff changeset
172 insert-register delete-backward-char backward-delete-char-untabify
cd42bdedadb3 (delsel-unload-hook): Remove function and variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 85073
diff changeset
173 delete-char newline-and-indent newline open-line))
87936
b3879b6d2e40 (delsel-unload-function): Don't use `remprop'; it is not autoloaded,
Juanma Barranquero <lekktu@gmail.com>
parents: 87933
diff changeset
174 (put sym 'delete-selection nil))
85811
cd42bdedadb3 (delsel-unload-hook): Remove function and variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 85073
diff changeset
175 ;; continue standard unloading
cd42bdedadb3 (delsel-unload-hook): Remove function and variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 85073
diff changeset
176 nil)
57540
8bf58c5521d8 (delsel-unload-hook): Set as a variable.
Richard M. Stallman <rms@gnu.org>
parents: 55278
diff changeset
177
2925
902c32c709f7 Provide delsel.
Richard M. Stallman <rms@gnu.org>
parents: 2903
diff changeset
178 (provide 'delsel)
2073
b4d5c9926d98 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
179
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87936
diff changeset
180 ;; arch-tag: 1e388890-1b50-4ed0-9347-763b1343b6ed
2925
902c32c709f7 Provide delsel.
Richard M. Stallman <rms@gnu.org>
parents: 2903
diff changeset
181 ;;; delsel.el ends here