Mercurial > emacs
annotate lisp/misc.el @ 85890:d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-ex.el (viper-ex): do not ignore the region.
* viper-cmd.el (viper-prev-destructive-command)
(viper-insert-prev-from-insertion-ring): use ring-copy instead of
copy-sequence.
* ediff-util.el (ediff-make-current-diff-overlay): do not use face-name.
Got rid of ediff-copy-list.
* ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): do not
use face-name.
(ediff-test-utility,ediff-diff-mandatory-option)
(ediff-reset-diff-options): removed to simplify yhe mandatory option
handling on windows.
(ediff-set-diff-options): added.
(ediff-diff-options): changed.
* ediff-vers.el (ediff-vc-internal): use ediff-vc-revision-other-window.
(ediff-vc-merge-internal): use ediff-vc-revision-other-window and
ediff-vc-working-revision.
Require vc-hooks.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Fri, 02 Nov 2007 06:03:12 +0000 |
parents | 9355f9b7bbff |
children | 73661ddc7ac7 f55f9811f5d7 |
rev | line source |
---|---|
18383 | 1 ;;; misc.el --- some nonstandard basic editing commands for Emacs |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
35
diff
changeset
|
2 |
74442 | 3 ;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, |
75347 | 4 ;; 2006, 2007 Free Software Foundation, Inc. |
845 | 5 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
6 ;; Maintainer: FSF |
45078 | 7 ;; Keywords: convenience |
35 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75347
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
35 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
35 | 25 |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
18383
diff
changeset
|
26 ;;; Commentary: |
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
18383
diff
changeset
|
27 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
28 ;;; Code: |
35 | 29 |
30 (defun copy-from-above-command (&optional arg) | |
31 "Copy characters from previous nonblank line, starting just above point. | |
32 Copy ARG characters, but not past the end of that line. | |
33 If no argument given, copy the entire rest of the line. | |
34 The characters copied are inserted in the buffer before point." | |
35 (interactive "P") | |
36 (let ((cc (current-column)) | |
37 n | |
38 (string "")) | |
39 (save-excursion | |
40 (beginning-of-line) | |
41 (backward-char 1) | |
42 (skip-chars-backward "\ \t\n") | |
43 (move-to-column cc) | |
44 ;; Default is enough to copy the whole rest of the line. | |
45 (setq n (if arg (prefix-numeric-value arg) (point-max))) | |
46 ;; If current column winds up in middle of a tab, | |
47 ;; copy appropriate number of "virtual" space chars. | |
48 (if (< cc (current-column)) | |
49 (if (= (preceding-char) ?\t) | |
50 (progn | |
74237
8dbfc40e9ab8
(copy-from-above-command): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
51 (setq string (make-string (min n (- (current-column) cc)) ?\s)) |
35 | 52 (setq n (- n (min n (- (current-column) cc))))) |
53 ;; In middle of ctl char => copy that whole char. | |
54 (backward-char 1))) | |
55 (setq string (concat string | |
56 (buffer-substring | |
57 (point) | |
58 (min (save-excursion (end-of-line) (point)) | |
59 (+ n (point))))))) | |
60 (insert string))) | |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
35
diff
changeset
|
61 |
52600
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
62 ;; Variation of `zap-to-char'. |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
63 |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
64 (defun zap-up-to-char (arg char) |
74260
b55f65338d33
(zap-up-to-char): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74237
diff
changeset
|
65 "Kill up to, but not including ARGth occurrence of CHAR. |
52600
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
66 Case is ignored if `case-fold-search' is non-nil in the current buffer. |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
67 Goes backward if ARG is negative; error if CHAR not found. |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
68 Ignores CHAR at point." |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
69 (interactive "p\ncZap up to char: ") |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
70 (let ((direction (if (>= arg 0) 1 -1))) |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
71 (kill-region (point) |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
72 (progn |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
73 (forward-char direction) |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
74 (unwind-protect |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
75 (search-forward (char-to-string char) nil nil arg) |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
76 (backward-char direction)) |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
77 (point))))) |
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
78 |
51340
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
79 ;; These were added with an eye to making possible a more CCA-compatible |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
80 ;; command set; but that turned out not to be interesting. |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
81 |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
82 (defun mark-beginning-of-buffer () |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
83 "Set mark at the beginning of the buffer." |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
84 (interactive) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
85 (push-mark (point-min))) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
86 |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
87 (defun mark-end-of-buffer () |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
88 "Set mark at the end of the buffer." |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
89 (interactive) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
90 (push-mark (point-max))) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
91 |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
92 (defun upcase-char (arg) |
52600
7a4a7a399a2f
(upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
93 "Uppercasify ARG chars starting from point. Point doesn't move." |
51340
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
94 (interactive "p") |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
95 (save-excursion |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
96 (upcase-region (point) (progn (forward-char arg) (point))))) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
97 |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
98 (defun forward-to-word (arg) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
99 "Move forward until encountering the beginning of a word. |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
100 With argument, do this that many times." |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
101 (interactive "p") |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
102 (or (re-search-forward (if (> arg 0) "\\W\\b" "\\b\\W") nil t arg) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
103 (goto-char (if (> arg 0) (point-max) (point-min))))) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
104 |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
105 (defun backward-to-word (arg) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
106 "Move backward until encountering the end of a word. |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
107 With argument, do this that many times." |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
108 (interactive "p") |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
109 (forward-to-word (- arg))) |
bd66b46adcc8
(mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents:
45078
diff
changeset
|
110 |
18383 | 111 (provide 'misc) |
112 | |
52401 | 113 ;;; arch-tag: 908f7884-c19e-4388-920c-9cfa425e449b |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
35
diff
changeset
|
114 ;;; misc.el ends here |