procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/saveplace.el (save-place-alist-to-file): Save list sorted and

Browse source 
pretty-printed, so that it is mergeable by line-based text merging,
  as suggested by Iain Dalton <iain.dalton {_AT_} gmail.com>.
This commit is contained in:
Karl Fogel 2010-12-28 22:24:09 -05:00
parent 2576c28f3a
commit 6e457cc94c
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2010-12-29 Karl Fogel <kfogel@red-bean.com>
* saveplace.el (save-place-alist-to-file): Save list sorted and
pretty-printed, so that it is mergeable by line-based text merging,
as suggested by Iain Dalton <iain.dalton {_AT_} gmail.com>.
2010-12-28 Chong Yidong <cyd@stupidchicken.com>
* tool-bar.el (tool-bar-setup): Remove :enable conditions, which

4
lisp/saveplace.el
View file

@ -213,7 +213,9 @@ may have changed\) back to `save-place-alist'."
(symbol-name coding-system-for-write)))
(let ((print-length nil)
(print-level nil))
(print save-place-alist (current-buffer)))
(pp (sort save-place-alist
(lambda (a b) (string< (car a) (car b))))
(current-buffer)))
(let ((version-control
(cond
((null save-place-version-control) nil)