Mercurial > emacs
annotate src/getpagesize.h @ 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 | 1d1d5d9bd884 |
children | 376148b31b5e 7df2e30d72ec |
rev | line source |
---|---|
36226 | 1 /* Emulate getpagesize on systems that lack it. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1986, 1992, 1995, 2001, 2002, 2003, 2004, |
106815 | 3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
36226 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87730
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
36226 | 8 it under the terms of the GNU General Public License as published by |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87730
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87730
diff
changeset
|
10 (at your option) any later version. |
36226 | 11 |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87730
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
4356 | 19 |
20 #ifndef HAVE_GETPAGESIZE | |
21 | |
16599 | 22 # ifdef HAVE_UNISTD_H |
23 # include <unistd.h> | |
24 # endif | |
4356 | 25 |
16599 | 26 # ifdef _SC_PAGESIZE |
27 # define getpagesize() sysconf(_SC_PAGESIZE) | |
16600
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
28 # else /* no _SC_PAGESIZE */ |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
29 # ifdef HAVE_SYS_PARAM_H |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
30 # include <sys/param.h> |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
31 # ifdef EXEC_PAGESIZE |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
32 # define getpagesize() EXEC_PAGESIZE |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
33 # else /* no EXEC_PAGESIZE */ |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
34 # ifdef NBPG |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
35 # define getpagesize() NBPG * CLSIZE |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
36 # ifndef CLSIZE |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
37 # define CLSIZE 1 |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
38 # endif /* no CLSIZE */ |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
39 # else /* no NBPG */ |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
40 # ifdef PAGESIZE |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
41 # define getpagesize() PAGESIZE |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
42 # endif /* PAGESIZE */ |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
43 # endif /* no NBPG */ |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
44 # endif /* no EXEC_PAGESIZE */ |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
45 # else /* no HAVE_SYS_PARAM_H */ |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
46 # define getpagesize() 8192 /* punt totally */ |
4f9e6148ce6a
If no sys/param.h, default to 8k.
David J. MacKenzie <djm@gnu.org>
parents:
16599
diff
changeset
|
47 # endif /* no HAVE_SYS_PARAM_H */ |
16599 | 48 # endif /* no _SC_PAGESIZE */ |
4356 | 49 |
16599 | 50 #endif /* no HAVE_GETPAGESIZE */ |
52401 | 51 |
52 /* arch-tag: ff6206e3-97e2-4763-923a-e84bf28eabbc | |
53 (do not change this comment) */ |