Mercurial > emacs
view admin/make-announcement @ 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 | b92c3979701c |
children | 376148b31b5e |
line wrap: on
line source
#! /bin/bash ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, ## 2010 Free Software Foundation, Inc. ## Author: Francesco Potorti` <pot@gnu.org> ## 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/>. ### Code: if [ $# -ne 2 ]; then echo "usage: $0 <old version number> <new version number>" >&2 exit 1 fi if [ ! -f INSTALL -o ! -f configure -o ! -d lib-src ]; then echo "this script should be run in the emacs root directory" >&2 exit 2 fi OLD=$1 NEW=$2 outfile=emacs-$NEW.announce oldtag=EMACS_PRETEST_$(echo $OLD|tr . _) newtag=EMACS_PRETEST_$(echo $NEW|tr . _) if [ -f $outfile ]; then echo "$outfile exists" echo -n "interrupt to abort, ENTER to overwrite "; read answer fi echo -n "tag name for OLD emacs version $OLD [$oldtag]: "; read answer if [ "$answer" ]; then oldtag=$answer; fi echo -n "tag name for NEW emacs version $NEW [$newtag]: "; read answer if [ "$answer" ]; then newtag=$answer; fi exec > $outfile cat <<EOF There is a new pretest available in <ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$NEW.tar.gz> Please report results from compiling and running the pretest to <bug-gnu-emacs@gnu.org>. Your feedback is necessary for us to know on which platforms the pretest has been tried. If you have the tars from the previous pretest, and you have the \`xdelta' utility, you can instead download the much smaller <ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$OLD-$NEW.xdelta> You can use a command like $ xdelta patch XDELTA PREVIOUS-TAR CURRENT-TAR to generate the new tar from the old one, where XDELTA is the xdelta file you downloaded, PREVIOUS-TAR is the tar file from the previous pretest, and CURRENT-TAR is the name of the tar file you downloaded. Information about xdelta can be found on the GNU ftp site, in /non-gnu/xdelta.README. Changes since $OLD EOF make-changelog-diff $oldtag $newtag echo " announcement created in $outfile" >&2 # arch-tag: 605e00c7-7330-4c45-81e1-2ed53a13c39f