From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kelly Dean Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] Desktop mode saves mark-ring too verbosely Date: Thu, 22 Jan 2015 05:43:47 +0000 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1421905503 25464 80.91.229.3 (22 Jan 2015 05:45:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 22 Jan 2015 05:45:03 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 22 06:44:59 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YEAZd-0004lm-0g for ged-emacs-devel@m.gmane.org; Thu, 22 Jan 2015 06:44:57 +0100 Original-Received: from localhost ([::1]:51301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEAZc-0007xQ-K3 for ged-emacs-devel@m.gmane.org; Thu, 22 Jan 2015 00:44:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEAZX-0007xF-8M for emacs-devel@gnu.org; Thu, 22 Jan 2015 00:44:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEAZT-0007af-Be for emacs-devel@gnu.org; Thu, 22 Jan 2015 00:44:51 -0500 Original-Received: from relay4-d.mail.gandi.net ([2001:4b98:c:538::196]:43776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEAZT-0007aV-5m for emacs-devel@gnu.org; Thu, 22 Jan 2015 00:44:47 -0500 Original-Received: from mfilter35-d.gandi.net (mfilter35-d.gandi.net [217.70.178.166]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id AC7E9172081; Thu, 22 Jan 2015 06:44:46 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter35-d.gandi.net Original-Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by mfilter35-d.gandi.net (mfilter35-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id czSJEpLCOG7H; Thu, 22 Jan 2015 06:44:45 +0100 (CET) X-Originating-IP: 66.220.3.179 Original-Received: from localhost (gm179.geneticmail.com [66.220.3.179]) (Authenticated sender: kelly@prtime.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 3486C172077; Thu, 22 Jan 2015 06:44:42 +0100 (CET) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4b98:c:538::196 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:181554 Archived-At: --=-=-= Content-Type: text/plain Stefan Monnier wrote: >> + (mapcar (lambda (p) >> + (set-marker (make-marker) p)) >> + bmr)))) > > Aka (mapcar #'copy-marker bmr) I forgot copy-marker existed. Updated patch attached. FYI I'm not a committer, so I'm only sending my patches to the mailing list. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=desktop-mark-ring-tablized-1.patch --- emacs-24.4/lisp/desktop.el +++ emacs-24.4/lisp/desktop.el @@ -135,7 +135,7 @@ (require 'cl-lib) (require 'frameset) -(defvar desktop-file-version "206" +(defvar desktop-file-version "208" "Version number of desktop file format. Written into the desktop file and used at desktop read to provide backward compatibility.") @@ -628,6 +628,18 @@ "When the desktop file was last modified to the knowledge of this Emacs. Used to detect desktop file conflicts.") +(defvar desktop-var-serdes-funs + (list (list + 'mark-ring + (lambda (mr) + (mapcar #'marker-position mr)) + (lambda (mr) + (mapcar #'copy-marker mr)))) + "Table of serdes functions for variables. +Each record is a list of form: (var serializer deserializer). +These records can be freely reordered, deleted, or new ones added. +However, for compatibility, don't modify the functions for existing records.") + (defun desktop-owner (&optional dirname) "Return the PID of the Emacs process that owns the desktop file in DIRNAME. Return nil if no desktop file found or no Emacs process is using it. @@ -779,7 +791,12 @@ (push here ll)) ((member local loclist) (push local ll))))) - ll))) + ll) + (mapcar (lambda (record) + (let ((var (car record))) + (list var + (funcall (cadr record) (symbol-value var))))) + desktop-var-serdes-funs))) ;; ---------------------------------------------------------------------------- (defun desktop--v2s (value) @@ -1336,7 +1353,9 @@ buffer-readonly buffer-misc &optional - buffer-locals) + buffer-locals + compacted-vars + &rest _unsupported) (let ((desktop-file-version file-version) (desktop-buffer-file-name buffer-filename) @@ -1426,7 +1445,14 @@ (set (car this) (cdr this))) ;; An entry of the form `symbol'. (make-local-variable this) - (makunbound this)))))))) + (makunbound this))) + (unless (< desktop-file-version 208) ; Don't misinterpret any old custom args + (dolist (record compacted-vars) + (let* + ((var (car record)) + (deser-fun (cl-caddr (assq var desktop-var-serdes-funs)))) + (if deser-fun (set var (funcall deser-fun (cadr record)))))))) + result)))) ;; ---------------------------------------------------------------------------- ;; Backward compatibility -- update parameters to 205 standards. --=-=-=--