unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: "Davis Herring" <herring@lanl.gov>
To: "Richard Stallman" <rms@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: desktop.el ugliness
Date: Thu, 12 Jul 2007 15:29:07 -0700 (PDT)	[thread overview]
Message-ID: <38898.128.165.123.18.1184279347.squirrel@webmail.lanl.gov> (raw)
In-Reply-To: <E1I968r-0002z2-AO@fencepost.gnu.org>

> 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  <herring@lanl.gov>

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

      reply	other threads:[~2007-07-12 22:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-12 21:24 desktop.el ugliness Richard Stallman
2007-07-12 22:29 ` Davis Herring [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=38898.128.165.123.18.1184279347.squirrel@webmail.lanl.gov \
    --to=herring@lanl.gov \
    --cc=emacs-devel@gnu.org \
    --cc=rms@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).