[Emacs-diffs] /srv/bzr/emacs/trunk r102719: * lisp/saveplace.el (save-place-alist-to-file): Save list sorted and

[Karl Fogel]

------------------------------------------------------------
revno: 102719
committer: Karl Fogel <address@hidden>
branch nick: trunk
timestamp: Tue 2010-12-28 22:24:09 -0500
message:
  * lisp/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>.
modified:
  lisp/ChangeLog
  lisp/saveplace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-28 09:39:25 +0000
+++ b/lisp/ChangeLog    2010-12-29 03:24:09 +0000
@@ -1,3 +1,9 @@
+2010-12-29  Karl Fogel  <address@hidden>
+
+       * 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  <address@hidden>
 
        * tool-bar.el (tool-bar-setup): Remove :enable conditions, which

=== modified file 'lisp/saveplace.el'
--- a/lisp/saveplace.el 2010-01-13 08:35:10 +0000
+++ b/lisp/saveplace.el 2010-12-29 03:24:09 +0000
@@ -213,7 +213,9 @@
                       (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)