Mercurial > emacs
view admin/build-configs @ 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 |
line wrap: on
line source
#! /usr/bin/perl # Build Emacs in several different configurations. # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. # This file is part of GNU Emacs. # GNU Emacs is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. require 5; use Getopt::Long; use File::Basename; use Cwd; @configs = ( ["--without-x", "--optim"], ["--without-x-toolkit", "--optim"], ["--without-toolkit-scroll-bars", "--optim"], ["--with-x-toolkit=lucid", "--optim"], ["--with-x-toolkit=motif", "--optim"], ["--with-x-toolkit=motif", "--enable-checking"], ["--with-x-toolkit=motif", "--gcc3"], ["--with-x-toolkit=motif", ""], ); $log = "/tmp/$$.out"; print "Using log file $log\n"; unlink $log; $root = $ENV{"EMACS_ROOT"}; $root = "/gd/gnu/emacs" unless $root; $rc = GetOptions ("help" => \$help); if ($rc == 0 || $help) { print <<USAGE; build-configs Build Emacs in different configurations. --help show this help USAGE exit 1; } # Chdir to the top-level directory of the tree. If not in a tree # containing Emacs, use the default. while (! -f "src/emacs.c" && cwd () ne "/") { chdir ".."; } chdir $root if cwd () eq "/"; print "Build in ", cwd (), "\n"; foreach $config (@configs) { my $configure_options = @$config[0]; my $make_options = @$config[1]; my $rc; print "$configure_options, $make_options\n"; unlink "config.cache"; $rc = system ("$root/configure $configure_options >>$log 2>&1"); if ($rc != 0) { print "configure failed\n"; exit 1; } $rc = system ("make-emacs --all $make_options >>$log 2>&1"); if ($rc != 0) { print "Make failed\n"; exit 1; } } # Local Variables: # mode: cperl # End: # arch-tag: 20a4452d-610a-4e54-9abc-ffe79f5c0d30