annotate src/macros.h @ 108806:511da81b16c5

Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 27 May 2010 19:30:11 -0400
parents 1d1d5d9bd884
children e16f43875a48 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Definitions for keyboard macro interpretation in GNU Emacs.
75227
e90d04cd455a Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents: 68651
diff changeset
2 Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100951
diff changeset
3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
94994
29adfc9354e7 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79759
diff changeset
7 GNU Emacs is free software: you can redistribute it and/or modify
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
94994
29adfc9354e7 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79759
diff changeset
9 the Free Software Foundation, either version 3 of the License, or
29adfc9354e7 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79759
diff changeset
10 (at your option) any later version.
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
94994
29adfc9354e7 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79759
diff changeset
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
15970
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
21 /* Kbd macro currently being executed (a string or vector). */
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22
61981
8131d95ff037 (Vexecuting_kbd_macro): Declare instead of Vexecuting_macro.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
23 extern Lisp_Object Vexecuting_kbd_macro;
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24
15970
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
25 /* Index of next character to fetch from that macro. */
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26
62024
4f7e1a56469e (executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents: 61981
diff changeset
27 extern EMACS_INT executing_kbd_macro_index;
15970
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
28
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
29 /* Number of successful iterations so far
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
30 for innermost keyboard macro.
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
31 This is not bound at each level,
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
32 so after an error, it describes the innermost interrupted macro. */
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
33
62024
4f7e1a56469e (executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents: 61981
diff changeset
34 extern int executing_kbd_macro_iterations;
15970
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
35
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
36 /* This is the macro that was executing.
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
37 This is not bound at each level,
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
38 so after an error, it describes the innermost interrupted macro. */
d54ae2343dff (executing_macro_iterations, executing_macro): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
39
62024
4f7e1a56469e (executing_kbd_macro_index): Rename from executing_macro_index.
Kim F. Storm <storm@cua.dk>
parents: 61981
diff changeset
40 extern Lisp_Object executing_kbd_macro;
20300
1030a9fcf001 Declare finalize_kbd_macro_chars and
Andreas Schwab <schwab@suse.de>
parents: 15970
diff changeset
41
47349
5c37672e24c8 (end_kbd_macro): Declare extern.
Kim F. Storm <storm@cua.dk>
parents: 47308
diff changeset
42 /* Finish defining the current keyboard macro. */
5c37672e24c8 (end_kbd_macro): Declare extern.
Kim F. Storm <storm@cua.dk>
parents: 47308
diff changeset
43
5c37672e24c8 (end_kbd_macro): Declare extern.
Kim F. Storm <storm@cua.dk>
parents: 47308
diff changeset
44 extern void end_kbd_macro P_ ((void));
5c37672e24c8 (end_kbd_macro): Declare extern.
Kim F. Storm <storm@cua.dk>
parents: 47308
diff changeset
45
20300
1030a9fcf001 Declare finalize_kbd_macro_chars and
Andreas Schwab <schwab@suse.de>
parents: 15970
diff changeset
46 /* Declare that all chars stored so far in the kbd macro being defined
1030a9fcf001 Declare finalize_kbd_macro_chars and
Andreas Schwab <schwab@suse.de>
parents: 15970
diff changeset
47 really belong to it. This is done in between editor commands. */
1030a9fcf001 Declare finalize_kbd_macro_chars and
Andreas Schwab <schwab@suse.de>
parents: 15970
diff changeset
48
1030a9fcf001 Declare finalize_kbd_macro_chars and
Andreas Schwab <schwab@suse.de>
parents: 15970
diff changeset
49 extern void finalize_kbd_macro_chars P_ ((void));
1030a9fcf001 Declare finalize_kbd_macro_chars and
Andreas Schwab <schwab@suse.de>
parents: 15970
diff changeset
50
1030a9fcf001 Declare finalize_kbd_macro_chars and
Andreas Schwab <schwab@suse.de>
parents: 15970
diff changeset
51 /* Store a character into kbd macro being defined */
1030a9fcf001 Declare finalize_kbd_macro_chars and
Andreas Schwab <schwab@suse.de>
parents: 15970
diff changeset
52
1030a9fcf001 Declare finalize_kbd_macro_chars and
Andreas Schwab <schwab@suse.de>
parents: 15970
diff changeset
53 extern void store_kbd_macro_char P_ ((Lisp_Object));
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 47349
diff changeset
54
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 47349
diff changeset
55 /* arch-tag: 8edb7088-682f-4d1f-a4d9-0fbb7284234e
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 47349
diff changeset
56 (do not change this comment) */