[PATCH] Desktop mode saves mark-ring too verbosely

[Kelly Dean <kellydeanch@yahoo.com>]

[-- Attachment #1: Type: text/plain, Size: 1400 bytes --]

You can (add-to-list 'desktop-locals-to-save 'mark-ring) and it works, so long as you have the fix for bug 13951 applied. But it's very verbose; for each element of mark-ring for each buffer, it writes an entry like

(let ((mk (make-marker))) (add-hook 'desktop-delay-hook (list 'lambda '() (list 'set-marker mk 123 '(get-buffer "init.el")))) mk)

The result is about 2kB of text to record a standard 16-element mark-ring. The file name is redundant, since it's already written as the first argument for desktop-create-buffer, and the rest of the line could be eliminated by special-casing saving of mark-ring, leaving just a list of marker positions to write into the desktop file, which will typically be less than 100 bytes of text. If you have dozens of file-visiting buffers, this can make the difference between a desktop file that's over 100kB and one that's just a few kB.

The attached patch does this. Surely this qualifies as a tiny change, since it only changes about 5 significant lines.

The "&rest _unsupported" is unnecessary; it just enables forward compatibility with files of version greater than 207. If it were already there, then version 206 code would be able to read version 207 files, and just ignore the mark ring.

Returning result from desktop-create-buffer is unnecessary for desktop mode, but it does no harm, and I need it in some of my other code, so please allow it.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: desktop-mark-ring.patch --]
[-- Type: text/x-diff; name="desktop-mark-ring.patch", Size: 1484 bytes --]

--- 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.