mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

(format-annotate-function): Only set

Browse Source 
write-region-post-annotation-function after running to-fn so as not to
affect nested write-region calls (bug#5273).
This commit is contained in:
Stefan Monnier 2010-01-10 00:22:54 -05:00
parent a069f06729
commit 4e5617ee40
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lisp/ChangeLog
View File

@ -1,7 +1,13 @@
2010-01-10 Stefan Monnier <monnier@iro.umontreal.ca>
* format.el (format-annotate-function): Only set
write-region-post-annotation-function after running to-fn so as not to
affect nested write-region calls (bug#5273).
2010-01-10 Chong Yidong <cyd@stupidchicken.com>
* cedet/semantic.el (semantic-new-buffer-setup-functions): Add
python parser.
* cedet/semantic.el (semantic-new-buffer-setup-functions):
Add python parser.
* Makefile.in (ELCFILES): Add wisent/python-wy.el and
wisent/python.el.
@ -33,8 +39,8 @@
2010-01-08 Kenichi Handa <handa@m17n.org>
* international/fontset.el (build-default-fontset-data): Exclude
characters in scripts kana, hangul, han, or cjk-misc.
* international/fontset.el (build-default-fontset-data):
Exclude characters in scripts kana, hangul, han, or cjk-misc.
2010-01-07 Juanma Barranquero <lekktu@gmail.com>
@ -54,8 +60,8 @@
2010-01-05 Tom Tromey <tromey@redhat.com>
* progmodes/python.el (python-font-lock-keywords): Handle
qualified decorators (Bug#881).
* progmodes/python.el (python-font-lock-keywords):
Handle qualified decorators (Bug#881).
2010-01-05 Dan Nicolaescu <dann@ics.uci.edu>
@ -64,8 +70,7 @@
2010-01-05 Kenichi Handa <handa@m17n.org>
* language/indian.el (malayalam-composable-pattern): Fix ZWNJ and
ZWJ.
* language/indian.el (malayalam-composable-pattern): Fix ZWNJ and ZWJ.
2010-01-05 Dan Nicolaescu <dann@ics.uci.edu>
@ -90,8 +95,8 @@
2010-01-02 Daniel Elliott <danelliottster@gmail.com> (tiny change)
* progmodes/octave-mod.el (octave-end-keywords)
(octave-block-begin-or-end-regexp, octave-block-match-alist): Add
"end" keyword (Bug#3061).
(octave-block-begin-or-end-regexp, octave-block-match-alist):
Add "end" keyword (Bug#3061).
(octave-end-as-array-index-p): New function.
(calculate-octave-indent): Use it.
@ -121,18 +126,18 @@
2010-01-02 Karl Fogel <kfogel@red-bean.com>
* bookmark.el (bookmark-bmenu-select, bookmark-bmenu-1-window,
* bookmark.el (bookmark-bmenu-select, bookmark-bmenu-1-window)
(bookmark-bmenu-2-window, bookmark-bmenu-this-window)
(bookmark-bmenu-other-window, bookmark-bmenu-switch-other-window)
(bookmark-bmenu-show-annotation, bookmark-bmenu-edit-annotation)
(bookmark-bmenu-rename, bookmark-bmenu-locate)
(bookmark-bmenu-relocate, bookmark-bmenu-goto-bookmark): Remove
unnecessary calls to `bookmark-bmenu-ensure-position'.
(bookmark-bmenu-relocate, bookmark-bmenu-goto-bookmark):
Remove unnecessary calls to `bookmark-bmenu-ensure-position'.
2010-01-02 Eli Zaretskii <eliz@gnu.org>
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Make
the lines in the generated doc string shorter. (Bug#4668)
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
Make the lines in the generated doc string shorter. (Bug#4668)
2010-01-02 Ryan Yeske <rcyeske@gmail.com>
@ -140,10 +145,10 @@
2010-01-02 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (bzr-update): Renamed from cvs-update.
* Makefile.in (bzr-update): Rename from cvs-update.
(cvs-update): New target for backward compatibility.
* makefile.w32-in (bzr-update): Renamed from cvs-update.
* makefile.w32-in (bzr-update): Rename from cvs-update.
(cvs-update): New target for backward compatibility.
2010-01-02 Karl Fogel <kfogel@red-bean.com>
@ -9765,7 +9770,7 @@ See ChangeLog.14 for earlier changes.
;; coding: utf-8
;; End:
Copyright (C) 2009 Free Software Foundation, Inc.
Copyright (C) 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.

12
lisp/format.el
View File

@ -222,9 +222,6 @@ For most purposes, consider using `format-encode-region' instead."
(multibyte enable-multibyte-characters)
(coding-system buffer-file-coding-system))
(with-current-buffer copy-buf
(set (make-local-variable
'write-region-post-annotation-function)
'kill-buffer)
(setq selective-display sel-disp)
(set-buffer-multibyte multibyte)
(setq buffer-file-coding-system coding-system))
@ -232,6 +229,15 @@ For most purposes, consider using `format-encode-region' instead."
(set-buffer copy-buf)
(format-insert-annotations write-region-annotations-so-far from)
(format-encode-run-method to-fn (point-min) (point-max) orig-buf)
(when (buffer-live-p copy-buf)
(with-current-buffer copy-buf
;; Set write-region-post-annotation-function to
;; delete the buffer once the write is done, but do
;; it after running to-fn so it doesn't affect
;; write-region calls in to-fn.
(set (make-local-variable
'write-region-post-annotation-function)
'kill-buffer)))
nil)
;; Otherwise just call function, it will return annotations.
(funcall to-fn from to orig-buf)))))