From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: [herring@lanl.gov: Re: desktop.el ugliness] Date: Fri, 13 Jul 2007 14:38:31 -0400 Message-ID: Reply-To: rms@gnu.org NNTP-Posting-Host: lo.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: sea.gmane.org 1184351953 23018 80.91.229.12 (13 Jul 2007 18:39:13 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 13 Jul 2007 18:39:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 13 20:39:11 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1I9Q2p-0005C8-70 for ged-emacs-devel@m.gmane.org; Fri, 13 Jul 2007 20:39:11 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I9Q2o-0005TT-HB for ged-emacs-devel@m.gmane.org; Fri, 13 Jul 2007 14:39:10 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1I9Q1c-0003iD-0W for emacs-devel@gnu.org; Fri, 13 Jul 2007 14:37:56 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1I9Q1Z-0003eO-RT for emacs-devel@gnu.org; Fri, 13 Jul 2007 14:37:55 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I9Q1Z-0003eB-L5 for emacs-devel@gnu.org; Fri, 13 Jul 2007 14:37:53 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1I9Q1Z-0000zc-Hj for emacs-devel@gnu.org; Fri, 13 Jul 2007 14:37:53 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.60) (envelope-from ) id 1I9Q2B-0008W2-Mb; Fri, 13 Jul 2007 14:38:31 -0400 X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:74731 Archived-At: Would someone please install this in Emacs 22 and the trunk, then ack? ------- Start of forwarded message ------- X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_PASS autolearn=failed version=3.1.0 In-Reply-To: Date: Thu, 12 Jul 2007 15:29:07 -0700 (PDT) Subject: Re: desktop.el ugliness From: "Davis Herring" To: "Richard Stallman" Cc: emacs-devel@gnu.org Reply-To: herring@lanl.gov MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 > desktop-buffer-info refers to the free variable dirname, which comes > from desktop-save. Would someone please clean that up? > Then please ack. Sorry; `desktop-buffer-info' was once a lambda in `desktop-save', and I didn't think to separate it cleanly. Here's a trivial patch which also corrects the handling of relative names in `desktop-save'. Davis 2007-07-12 Davis Herring * desktop.el (desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'. *** desktop.el 12 Jul 2007 16:23:06 -0600 1.112 - --- desktop.el 12 Jul 2007 16:25:35 -0600 *************** *** 652,658 **** (set-buffer buffer) (list ;; basic information ! (desktop-file-name (buffer-file-name) dirname) (buffer-name) major-mode ;; minor modes - --- 652,658 ---- (set-buffer buffer) (list ;; basic information ! (desktop-file-name (buffer-file-name) desktop-dirname) (buffer-name) major-mode ;; minor modes *************** *** 673,679 **** buffer-read-only ;; auxiliary information (when (functionp desktop-save-buffer) ! (funcall desktop-save-buffer dirname)) ;; local variables (let ((locals desktop-locals-to-save) (loclist (buffer-local-variables)) - --- 673,679 ---- buffer-read-only ;; auxiliary information (when (functionp desktop-save-buffer) ! (funcall desktop-save-buffer desktop-dirname)) ;; local variables (let ((locals desktop-locals-to-save) (loclist (buffer-local-variables)) *************** *** 896,902 **** (insert "\n " (desktop-value-to-string e))) (insert ")\n\n"))) ! (setq default-directory dirname) (let ((coding-system-for-write 'emacs-mule)) (write-region (point-min) (point-max) (desktop-full-file-name) nil 'nomessage)) ;; We remember when it was modified (which is presumably just now). - --- 896,902 ---- (insert "\n " (desktop-value-to-string e))) (insert ")\n\n"))) ! (setq default-directory desktop-dirname) (let ((coding-system-for-write 'emacs-mule)) (write-region (point-min) (point-max) (desktop-full-file-name) nil 'nomessage)) ;; We remember when it was modified (which is presumably just now). ------- End of forwarded message -------