annotate src/ns.mk @ 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 dedcf813aa69
children 6378d1b57038
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
108798
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
1 ### autodeps.mk --- src/Makefile fragment for GNU Emacs
108730
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
2
108798
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
3 ## Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
108730
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
4
108798
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
5 ## This file is part of GNU Emacs.
108730
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
6
108798
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
7 ## GNU Emacs is free software: you can redistribute it and/or modify
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
8 ## it under the terms of the GNU General Public License as published by
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
9 ## the Free Software Foundation, either version 3 of the License, or
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
10 ## (at your option) any later version.
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
11 ##
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
12 ## GNU Emacs is distributed in the hope that it will be useful,
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
13 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
14 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
15 ## GNU General Public License for more details.
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
16 ##
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
17 ## You should have received a copy of the GNU General Public License
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
18 ## along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
108730
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
19
108798
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
20 ### Commentary:
108730
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
21
108798
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
22 ## This is inserted in src/Makefile if HAVE_NS.
108730
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
23
108798
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
24 ## The only reason this is in a separate file is because $ns_appdir,
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
25 ## which appears as a target, is empty on non-NS builds. Some makes
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
26 ## do not like empty targets, even if they are never used.
108730
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
27
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
28 ${ns_appdir}: ${ns_appsrc}
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
29 rm -fr ${ns_appdir}
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
30 mkdir -p ${ns_appdir}
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
31 ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - )
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
32
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
33 ${ns_appbindir}Emacs: emacs${EXEEXT}
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
34 mkdir -p ${ns_appbindir}
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
35 cp -f emacs${EXEEXT} ${ns_appbindir}Emacs
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
36
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
37 ns-app: ${ns_appdir} ${ns_appbindir}Emacs
c554bb2aba83 Handle some HAVE_NS Makefile conditionals with configure.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
38
108798
dedcf813aa69 Do not preprocess src/Makefile.in.
Glenn Morris <rgm@gnu.org>
parents: 108730
diff changeset
39 ### ns.mk ends here