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