[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: desktop.el ugliness
From: |
Davis Herring |
Subject: |
Re: desktop.el ugliness |
Date: |
Thu, 12 Jul 2007 15:29:07 -0700 (PDT) |
User-agent: |
SquirrelMail/1.4.8-6.el3.2lanl |
> 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 <address@hidden>
* 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).