--- emacs-24.3/lisp/desktop.el +++ emacs-24.3/lisp/desktop.el @@ -133,7 +133,7 @@ ;;; Code: -(defvar desktop-file-version "206" +(defvar desktop-file-version "207" "Version number of desktop file format. Written into the desktop file and used at desktop read to provide backward compatibility.") @@ -694,7 +694,8 @@ (when (member (car locals) loclist) (setq ll (cons (car locals) ll))))) (setq locals (cdr locals))) - ll))) + ll) + (mapcar 'marker-position mark-ring))) ;; ---------------------------------------------------------------------------- (defun desktop-internal-v2s (value) @@ -1145,7 +1146,9 @@ buffer-readonly buffer-misc &optional - buffer-locals) + buffer-locals + buffer-mark-ring + &rest _unsupported) (let ((desktop-file-version file-version) (desktop-buffer-file-name buffer-filename) @@ -1233,7 +1236,11 @@ ;; an entry of the form `symbol' (make-local-variable this) (makunbound this))) - (setq desktop-buffer-locals (cdr desktop-buffer-locals)))))))) + (setq desktop-buffer-locals (cdr desktop-buffer-locals))) + (unless (< desktop-file-version 207) ;; Don't misinterpret any old custom args + (setq mark-ring + (mapcar (lambda (p) (set-marker (make-marker) p)) buffer-mark-ring)))) + result)))) ;; ---------------------------------------------------------------------------- ;; Backward compatibility -- update parameters to 205 standards.