Mercurial > emacs
annotate oldXMenu/XCrAssoc.c @ 109383:dcdf09a52e2c
[[[
* lisp/bookmark.el (bookmark-bmenu-switch-other-window,
bookmark-bmenu-other-window, bookmark-bmenu-2-window): Don't override
ambient binding of `bookmark-automatically-show-annotations'. (Bug #6515)
]]]
=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el 2010-04-14 15:07:53 +0000
+++ lisp/bookmark.el 2010-06-27 03:40:14 +0000
@@ -1860,8 +1860,7 @@
(pop-up-windows t))
(delete-other-windows)
(switch-to-buffer (other-buffer))
- (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed?
- (bookmark--jump-via bmrk 'pop-to-buffer))
+ (bookmark--jump-via bmrk 'pop-to-buffer)
(bury-buffer menu)))
@@ -1875,8 +1874,7 @@
"Select this line's bookmark in other window, leaving bookmark menu visible."
(interactive)
(let ((bookmark (bookmark-bmenu-bookmark)))
- (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
- (bookmark--jump-via bookmark 'switch-to-buffer-other-window))))
+ (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))
(defun bookmark-bmenu-switch-other-window ()
@@ -1887,8 +1885,7 @@
(pop-up-windows t)
same-window-buffer-names
same-window-regexps)
- (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
- (bookmark--jump-via bookmark 'display-buffer))))
+ (bookmark--jump-via bookmark 'display-buffer)))
(defun bookmark-bmenu-other-window-with-mouse (event)
"Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."
=== modified file 'lisp/saveplace.el'
--- lisp/saveplace.el 2010-01-13 08:35:10 +0000
+++ lisp/saveplace.el 2010-02-07 23:14:52 +0000
@@ -213,7 +213,7 @@
(symbol-name coding-system-for-write)))
(let ((print-length nil)
(print-level nil))
- (print save-place-alist (current-buffer)))
+ (pp save-place-alist (current-buffer)))
(let ((version-control
(cond
((null save-place-version-control) nil)
author | Karl Fogel <kfogel@red-bean.com> |
---|---|
date | Tue, 13 Jul 2010 18:09:20 -0400 |
parents | 5cc91198ffb2 |
children | ef719132ddfa |
rev | line source |
---|---|
25858 | 1 /* Copyright Massachusetts Institute of Technology 1985 */ |
76133
995b45abe69d
Remove license text in favour of including copyright.h, as was done in
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
2 #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
|
3 |
25858 | 4 |
5 #include <config.h> | |
6 #include <X11/Xlib.h> | |
7 #include <errno.h> | |
8 #include "X10.h" | |
9 | |
10 #ifndef NULL | |
11 #define NULL 0 | |
12 #endif | |
13 | |
14 /* | |
15 * XCreateAssocTable - Create an XAssocTable. The size argument should be | |
16 * a power of two for efficiency reasons. Some size suggestions: use 32 | |
17 * buckets per 100 objects; a reasonable maximum number of object per | |
18 * buckets is 8. If there is an error creating the XAssocTable, a NULL | |
19 * pointer is returned. | |
20 */ | |
109124
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
21 XAssocTable *XCreateAssocTable(register int size) |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
22 /* Desired size of the table. */ |
25858 | 23 { |
24 register XAssocTable *table; /* XAssocTable to be initialized. */ | |
25 register XAssoc *buckets; /* Pointer to the first bucket in */ | |
26 /* the bucket array. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
27 |
25858 | 28 /* Malloc the XAssocTable. */ |
29 if ((table = (XAssocTable *)malloc(sizeof(XAssocTable))) == NULL) { | |
30 /* malloc call failed! */ | |
31 errno = ENOMEM; | |
32 return(NULL); | |
33 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
34 |
25858 | 35 /* calloc the buckets (actually just their headers). */ |
36 buckets = (XAssoc *)calloc((unsigned)size, (unsigned)sizeof(XAssoc)); | |
37 if (buckets == NULL) { | |
38 /* calloc call failed! */ | |
39 errno = ENOMEM; | |
40 return(NULL); | |
41 } | |
42 | |
43 /* Insert table data into the XAssocTable structure. */ | |
44 table->buckets = buckets; | |
45 table->size = size; | |
46 | |
47 while (--size >= 0) { | |
48 /* Initialize each bucket. */ | |
49 buckets->prev = buckets; | |
50 buckets->next = buckets; | |
51 buckets++; | |
52 } | |
53 | |
54 return(table); | |
55 } | |
52401 | 56 |
57 /* arch-tag: 5df3237d-ada0-4345-a3ab-282cafb397aa | |
58 (do not change this comment) */ |