annotate lisp/play/spook.el @ 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 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 444
diff changeset
1 ;;; spook.el --- spook phrase utility for overloading the NSA line eater
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 444
diff changeset
2
74509
f7702c5f335d Update copyright years.
Glenn Morris <rgm@gnu.org>
parents: 68634
diff changeset
3 ;; Copyright (C) 1988, 1993, 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.
841
2cdce064065f entered into RCS
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 814
diff changeset
5
814
38b2499cb3e9 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
6 ;; Maintainer: FSF
38b2499cb3e9 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
7 ;; Keywords: games
2315
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 1219
diff changeset
8 ;; Created: May 1987
787
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
9
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
11
94675
949bd6ad1ba4 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
94675
949bd6ad1ba4 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
949bd6ad1ba4 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
15 ;; (at your option) any later version.
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
16
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
20 ;; GNU General Public License for more details.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
21
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
94675
949bd6ad1ba4 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
24
787
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
25 ;;; Commentary:
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
26
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 4091
diff changeset
27 ;; Steve Strassmann <straz@media-lab.media.mit.edu> didn't write
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 4091
diff changeset
28 ;; this, and even if he did, he really didn't mean for you to use it
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 4091
diff changeset
29 ;; in an anarchistic way.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 4091
diff changeset
30 ;;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 4091
diff changeset
31 ;; To use this:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 4091
diff changeset
32 ;; Just before sending mail, do M-x spook.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 4091
diff changeset
33 ;; A number of phrases will be inserted into your buffer, to help
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 4091
diff changeset
34 ;; give your message that extra bit of attractiveness for automated
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 4091
diff changeset
35 ;; keyword scanners. Help defeat the NSA trunk trawler!
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
36
787
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
37 ;;; Code:
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
38
3384
55e7bbf78b1a Use cookie1.el.
Richard M. Stallman <rms@gnu.org>
parents: 2320
diff changeset
39 (require 'cookie1)
2320
ee096523431c Modified to use cookie.el
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
40
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
41 ; Variables
21363
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
42 (defgroup spook nil
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
43 "Spook phrase utility for overloading the NSA line eater."
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
44 :prefix "spook-"
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
45 :group 'games)
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
46
32296
dbb638e8f5d5 (spook-phrases-file): Use expand-file-name, not
Dave Love <fx@gnu.org>
parents: 21363
diff changeset
47 (defcustom spook-phrases-file (expand-file-name "spook.lines" data-directory)
21363
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
48 "Keep your favorite phrases here."
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
49 :type 'file
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
50 :group 'spook)
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
51
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
52 (defcustom spook-phrase-default-count 15
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
53 "Default number of phrases to insert."
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
54 :type 'integer
f1fc193b6958 Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18383
diff changeset
55 :group 'spook)
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
56
1219
3e9034e7bebf (spook): Make it autoload.
Richard M. Stallman <rms@gnu.org>
parents: 841
diff changeset
57 ;;;###autoload
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
58 (defun spook ()
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
59 "Adds that special touch of class to your outgoing mail."
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
60 (interactive)
4091
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
61 (cookie-insert spook-phrases-file
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
62 spook-phrase-default-count
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
63 "Checking authorization..."
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
64 "Checking authorization...Approved"))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
65
4091
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
66 ;;;###autoload
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
67 (defun snarf-spooks ()
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
68 "Return a vector containing the lines from `spook-phrases-file'."
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
69 (cookie-snarf spook-phrases-file
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
70 "Checking authorization..."
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
71 "Checking authorization...Approved"))
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
72
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
73 ;; Note: the implementation that used to take up most of this file has been
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
74 ;; cleaned up, generalized, gratuitously broken by esr, and now resides in
51d19cce579f (snarf-spooks): Restore function.
Roland McGrath <roland@gnu.org>
parents: 3384
diff changeset
75 ;; cookie1.el.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 444
diff changeset
76
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
77 (provide 'spook)
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
78
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79716
diff changeset
79 ;; arch-tag: c682b61f-92b6-4492-9c0d-2367e562449c
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 444
diff changeset
80 ;;; spook.el ends here