Mercurial > emacs
annotate lib-src/test-distrib.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 | 12b02558bf51 |
children | 5c1a707ab452 |
rev | line source |
---|---|
36226 | 1 /* test-distrib.c --- testing distribution of nonprinting chars |
2 | |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
3 Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003, 2004, 2005, |
106815 | 4 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
36226 | 5 |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
6 This file is part of GNU Emacs. |
36226 | 7 |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
9 it under the terms of the GNU General Public License as published by |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
11 (at your option) any later version. |
36226 | 12 |
94828
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
13 GNU Emacs is distributed in the hope that it will be useful, |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
14 but WITHOUT ANY WARRANTY; without even the implied warranty of |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
16 GNU General Public License for more details. |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
17 |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
18 You should have received a copy of the GNU General Public License |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
3a4bc081639c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79748
diff
changeset
|
20 |
36226 | 21 |
12935
f65e672e038e
[HAVE_CONFIG_H]: Include config.h.
Roland McGrath <roland@gnu.org>
parents:
9491
diff
changeset
|
22 #ifdef HAVE_CONFIG_H |
f65e672e038e
[HAVE_CONFIG_H]: Include config.h.
Roland McGrath <roland@gnu.org>
parents:
9491
diff
changeset
|
23 #include <config.h> |
f65e672e038e
[HAVE_CONFIG_H]: Include config.h.
Roland McGrath <roland@gnu.org>
parents:
9491
diff
changeset
|
24 #endif |
f65e672e038e
[HAVE_CONFIG_H]: Include config.h.
Roland McGrath <roland@gnu.org>
parents:
9491
diff
changeset
|
25 |
10 | 26 #include <stdio.h> |
27 | |
42146 | 28 #ifdef HAVE_FCNTL_H |
42135 | 29 #include <fcntl.h> |
30 #endif | |
31 | |
25447
76e2d539ecad
Include <unistd.h> if available.
Andreas Schwab <schwab@suse.de>
parents:
12976
diff
changeset
|
32 #ifdef HAVE_UNISTD_H |
76e2d539ecad
Include <unistd.h> if available.
Andreas Schwab <schwab@suse.de>
parents:
12976
diff
changeset
|
33 #include <unistd.h> |
76e2d539ecad
Include <unistd.h> if available.
Andreas Schwab <schwab@suse.de>
parents:
12976
diff
changeset
|
34 #endif |
76e2d539ecad
Include <unistd.h> if available.
Andreas Schwab <schwab@suse.de>
parents:
12976
diff
changeset
|
35 |
12935
f65e672e038e
[HAVE_CONFIG_H]: Include config.h.
Roland McGrath <roland@gnu.org>
parents:
9491
diff
changeset
|
36 #ifndef O_RDONLY |
f65e672e038e
[HAVE_CONFIG_H]: Include config.h.
Roland McGrath <roland@gnu.org>
parents:
9491
diff
changeset
|
37 #define O_RDONLY 0 |
f65e672e038e
[HAVE_CONFIG_H]: Include config.h.
Roland McGrath <roland@gnu.org>
parents:
9491
diff
changeset
|
38 #endif |
f65e672e038e
[HAVE_CONFIG_H]: Include config.h.
Roland McGrath <roland@gnu.org>
parents:
9491
diff
changeset
|
39 |
10 | 40 /* Break string in two parts to avoid buggy C compilers that ignore characters |
41 after nulls in strings. */ | |
42 | |
43 char string1[] = "Testing distribution of nonprinting chars:\n\ | |
44 Should be 0177: \177 Should be 0377: \377 Should be 0212: \212.\n\ | |
45 Should be 0000: "; | |
46 | |
47 char string2[] = ".\n\ | |
48 This file is read by the `test-distribution' program.\n\ | |
49 If you change it, you will make that program fail.\n"; | |
50 | |
51 char buf[300]; | |
42439
d8a417105504
Remove unnecessary whitespaces.
Pavel Janík <Pavel@Janik.cz>
parents:
42259
diff
changeset
|
52 |
10 | 53 /* Like `read' but keeps trying until it gets SIZE bytes or reaches eof. */ |
54 int | |
109125
12b02558bf51
* lib-src/fakemail.c (action): Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
55 cool_read (int fd, char *buf, int size) |
10 | 56 { |
57 int num, sofar = 0; | |
58 | |
59 while (1) | |
60 { | |
61 if ((num = read (fd, buf + sofar, size - sofar)) == 0) | |
62 return sofar; | |
63 else if (num < 0) | |
64 return num; | |
65 sofar += num; | |
66 } | |
67 } | |
68 | |
9491
dd3b83e4ceb0
Eliminate some -Wall warnings.
David J. MacKenzie <djm@gnu.org>
parents:
2814
diff
changeset
|
69 int |
109125
12b02558bf51
* lib-src/fakemail.c (action): Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106815
diff
changeset
|
70 main (int argc, char **argv) |
10 | 71 { |
2814
0da5b58e98ed
Install patches from David J. Mackenzie to make the srcdir option
Jim Blandy <jimb@redhat.com>
parents:
10
diff
changeset
|
72 int fd; |
10 | 73 |
2814
0da5b58e98ed
Install patches from David J. Mackenzie to make the srcdir option
Jim Blandy <jimb@redhat.com>
parents:
10
diff
changeset
|
74 if (argc != 2) |
0da5b58e98ed
Install patches from David J. Mackenzie to make the srcdir option
Jim Blandy <jimb@redhat.com>
parents:
10
diff
changeset
|
75 { |
0da5b58e98ed
Install patches from David J. Mackenzie to make the srcdir option
Jim Blandy <jimb@redhat.com>
parents:
10
diff
changeset
|
76 fprintf (stderr, "Usage: %s testfile\n", argv[0]); |
55500
70c5b89b216b
(main): For failing cases, exit with `EXIT_FAILURE'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
55442
diff
changeset
|
77 exit (EXIT_FAILURE); |
2814
0da5b58e98ed
Install patches from David J. Mackenzie to make the srcdir option
Jim Blandy <jimb@redhat.com>
parents:
10
diff
changeset
|
78 } |
12935
f65e672e038e
[HAVE_CONFIG_H]: Include config.h.
Roland McGrath <roland@gnu.org>
parents:
9491
diff
changeset
|
79 fd = open (argv[1], O_RDONLY); |
10 | 80 if (fd < 0) |
81 { | |
2814
0da5b58e98ed
Install patches from David J. Mackenzie to make the srcdir option
Jim Blandy <jimb@redhat.com>
parents:
10
diff
changeset
|
82 perror (argv[1]); |
55500
70c5b89b216b
(main): For failing cases, exit with `EXIT_FAILURE'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
55442
diff
changeset
|
83 exit (EXIT_FAILURE); |
10 | 84 } |
85 if (cool_read (fd, buf, sizeof string1) != sizeof string1 || | |
86 strcmp (buf, string1) || | |
87 cool_read (fd, buf, sizeof string2) != sizeof string2 - 1 || | |
88 strncmp (buf, string2, sizeof string2 - 1)) | |
89 { | |
2814
0da5b58e98ed
Install patches from David J. Mackenzie to make the srcdir option
Jim Blandy <jimb@redhat.com>
parents:
10
diff
changeset
|
90 fprintf (stderr, "Data in file `%s' has been damaged.\n\ |
10 | 91 Most likely this means that many nonprinting characters\n\ |
2814
0da5b58e98ed
Install patches from David J. Mackenzie to make the srcdir option
Jim Blandy <jimb@redhat.com>
parents:
10
diff
changeset
|
92 have been corrupted in the files of Emacs, and it will not work.\n", |
0da5b58e98ed
Install patches from David J. Mackenzie to make the srcdir option
Jim Blandy <jimb@redhat.com>
parents:
10
diff
changeset
|
93 argv[1]); |
55500
70c5b89b216b
(main): For failing cases, exit with `EXIT_FAILURE'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
55442
diff
changeset
|
94 exit (EXIT_FAILURE); |
10 | 95 } |
96 close (fd); | |
55442
a47704955f8d
Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
97 return EXIT_SUCCESS; |
10 | 98 } |
52401 | 99 |
100 /* arch-tag: 3a89005d-df98-4c32-aa9f-33570e16a26a | |
101 (do not change this comment) */ | |
55442
a47704955f8d
Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
102 |
a47704955f8d
Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
103 /* test-distrib.c ends here */ |