annotate oldXMenu/XMakeAssoc.c @ 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 77b2ab19bece
children 648e6c714c7d 5cc91198ffb2 a63dbe9548aa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
1 /* Copyright Massachusetts Institute of Technology 1985 */
Dave Love <fx@gnu.org>
parents:
diff changeset
2
76133
995b45abe69d Remove license text in favour of including copyright.h, as was done in
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
3 #include "copyright.h"
995b45abe69d Remove license text in favour of including copyright.h, as was done in
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
4
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
5
Dave Love <fx@gnu.org>
parents:
diff changeset
6 #include <config.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
7 #include <X11/Xlib.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
8 #include <X11/Xresource.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
9 #include "X10.h"
Dave Love <fx@gnu.org>
parents:
diff changeset
10 #include <errno.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
11
Dave Love <fx@gnu.org>
parents:
diff changeset
12 #ifndef NULL
Dave Love <fx@gnu.org>
parents:
diff changeset
13 #define NULL 0
Dave Love <fx@gnu.org>
parents:
diff changeset
14 #endif
Dave Love <fx@gnu.org>
parents:
diff changeset
15
Dave Love <fx@gnu.org>
parents:
diff changeset
16 extern int errno;
Dave Love <fx@gnu.org>
parents:
diff changeset
17
Dave Love <fx@gnu.org>
parents:
diff changeset
18 void emacs_insque();
Dave Love <fx@gnu.org>
parents:
diff changeset
19 struct qelem {
Dave Love <fx@gnu.org>
parents:
diff changeset
20 struct qelem *q_forw;
Dave Love <fx@gnu.org>
parents:
diff changeset
21 struct qelem *q_back;
Dave Love <fx@gnu.org>
parents:
diff changeset
22 char q_data[1];
Dave Love <fx@gnu.org>
parents:
diff changeset
23 };
Dave Love <fx@gnu.org>
parents:
diff changeset
24 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
25 * XMakeAssoc - Insert data into an XAssocTable keyed on an XId.
Dave Love <fx@gnu.org>
parents:
diff changeset
26 * Data is inserted into the table only once. Redundant inserts are
Dave Love <fx@gnu.org>
parents:
diff changeset
27 * meaningless (but cause no problems). The queue in each association
Dave Love <fx@gnu.org>
parents:
diff changeset
28 * bucket is sorted (lowest XId to highest XId).
Dave Love <fx@gnu.org>
parents:
diff changeset
29 */
Dave Love <fx@gnu.org>
parents:
diff changeset
30 XMakeAssoc(dpy, table, x_id, data)
Dave Love <fx@gnu.org>
parents:
diff changeset
31 register Display *dpy;
Dave Love <fx@gnu.org>
parents:
diff changeset
32 register XAssocTable *table;
Dave Love <fx@gnu.org>
parents:
diff changeset
33 register XID x_id;
Dave Love <fx@gnu.org>
parents:
diff changeset
34 register caddr_t data;
Dave Love <fx@gnu.org>
parents:
diff changeset
35 {
Dave Love <fx@gnu.org>
parents:
diff changeset
36 int hash;
Dave Love <fx@gnu.org>
parents:
diff changeset
37 register XAssoc *bucket;
Dave Love <fx@gnu.org>
parents:
diff changeset
38 register XAssoc *Entry;
Dave Love <fx@gnu.org>
parents:
diff changeset
39 register XAssoc *new_entry;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
40
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
41 /* Hash the XId to get the bucket number. */
Dave Love <fx@gnu.org>
parents:
diff changeset
42 hash = x_id & (table->size - 1);
Dave Love <fx@gnu.org>
parents:
diff changeset
43 /* Look up the bucket to get the entries in that bucket. */
Dave Love <fx@gnu.org>
parents:
diff changeset
44 bucket = &table->buckets[hash];
Dave Love <fx@gnu.org>
parents:
diff changeset
45 /* Get the first entry in the bucket. */
Dave Love <fx@gnu.org>
parents:
diff changeset
46 Entry = bucket->next;
Dave Love <fx@gnu.org>
parents:
diff changeset
47
Dave Love <fx@gnu.org>
parents:
diff changeset
48 /* If (Entry != bucket), the bucket is empty so make */
Dave Love <fx@gnu.org>
parents:
diff changeset
49 /* the new entry the first entry in the bucket. */
Dave Love <fx@gnu.org>
parents:
diff changeset
50 /* if (Entry == bucket), the we have to search the */
Dave Love <fx@gnu.org>
parents:
diff changeset
51 /* bucket. */
Dave Love <fx@gnu.org>
parents:
diff changeset
52 if (Entry != bucket) {
Dave Love <fx@gnu.org>
parents:
diff changeset
53 /* The bucket isn't empty, begin searching. */
Dave Love <fx@gnu.org>
parents:
diff changeset
54 /* If we leave the for loop then we have either passed */
Dave Love <fx@gnu.org>
parents:
diff changeset
55 /* where the entry should be or hit the end of the bucket. */
Dave Love <fx@gnu.org>
parents:
diff changeset
56 /* In either case we should then insert the new entry */
Dave Love <fx@gnu.org>
parents:
diff changeset
57 /* before the current value of "Entry". */
Dave Love <fx@gnu.org>
parents:
diff changeset
58 for (; Entry != bucket; Entry = Entry->next) {
Dave Love <fx@gnu.org>
parents:
diff changeset
59 if (Entry->x_id == x_id) {
Dave Love <fx@gnu.org>
parents:
diff changeset
60 /* Entry has the same XId... */
Dave Love <fx@gnu.org>
parents:
diff changeset
61 if (Entry->display == dpy) {
Dave Love <fx@gnu.org>
parents:
diff changeset
62 /* Entry has the same Display... */
Dave Love <fx@gnu.org>
parents:
diff changeset
63 /* Therefore there is already an */
Dave Love <fx@gnu.org>
parents:
diff changeset
64 /* entry with this XId and Display, */
Dave Love <fx@gnu.org>
parents:
diff changeset
65 /* reset its data value and return. */
Dave Love <fx@gnu.org>
parents:
diff changeset
66 Entry->data = data;
Dave Love <fx@gnu.org>
parents:
diff changeset
67 return;
Dave Love <fx@gnu.org>
parents:
diff changeset
68 }
Dave Love <fx@gnu.org>
parents:
diff changeset
69 /* We found an association with the right */
Dave Love <fx@gnu.org>
parents:
diff changeset
70 /* id but the wrong display! */
Dave Love <fx@gnu.org>
parents:
diff changeset
71 continue;
Dave Love <fx@gnu.org>
parents:
diff changeset
72 }
Dave Love <fx@gnu.org>
parents:
diff changeset
73 /* If the current entry's XId is greater than the */
Dave Love <fx@gnu.org>
parents:
diff changeset
74 /* XId of the entry to be inserted then we have */
Dave Love <fx@gnu.org>
parents:
diff changeset
75 /* passed the location where the new XId should */
Dave Love <fx@gnu.org>
parents:
diff changeset
76 /* be inserted. */
Dave Love <fx@gnu.org>
parents:
diff changeset
77 if (Entry->x_id > x_id) break;
Dave Love <fx@gnu.org>
parents:
diff changeset
78 }
Dave Love <fx@gnu.org>
parents:
diff changeset
79 }
Dave Love <fx@gnu.org>
parents:
diff changeset
80
Dave Love <fx@gnu.org>
parents:
diff changeset
81 /* If we are here then the new entry should be inserted just */
Dave Love <fx@gnu.org>
parents:
diff changeset
82 /* before the current value of "Entry". */
Dave Love <fx@gnu.org>
parents:
diff changeset
83 /* Create a new XAssoc and load it with new provided data. */
77837
77b2ab19bece Ulrich Mueller <ulm at gentoo.org> (tiny change)
Glenn Morris <rgm@gnu.org>
parents: 76174
diff changeset
84 new_entry = (XAssoc *) malloc(sizeof(XAssoc));
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
85 new_entry->display = dpy;
Dave Love <fx@gnu.org>
parents:
diff changeset
86 new_entry->x_id = x_id;
Dave Love <fx@gnu.org>
parents:
diff changeset
87 new_entry->data = data;
Dave Love <fx@gnu.org>
parents:
diff changeset
88
Dave Love <fx@gnu.org>
parents:
diff changeset
89 /* Insert the new entry. */
Dave Love <fx@gnu.org>
parents:
diff changeset
90 emacs_insque((struct qelem *)new_entry, (struct qelem *)Entry->prev);
Dave Love <fx@gnu.org>
parents:
diff changeset
91 }
Dave Love <fx@gnu.org>
parents:
diff changeset
92
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
93 /* arch-tag: d7e3fb8a-f3b3-4c5d-a307-75ca67ec1b49
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
94 (do not change this comment) */