Commit 9e29c91c authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

(desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'.

parent 9c0a6042
2007-07-12 Davis Herring <herring@lanl.gov>
* desktop.el (desktop-buffer-info, desktop-save):
Use `desktop-dirname' instead of `dirname'.
2007-07-12 Paul Pogonyshev <pogonyshev@gmx.net> 2007-07-12 Paul Pogonyshev <pogonyshev@gmx.net>
* progmodes/which-func.el (which-func-modes): Add `python-mode'. * progmodes/which-func.el (which-func-modes): Add `python-mode'.
...@@ -94,7 +99,6 @@ ...@@ -94,7 +99,6 @@
* emacs-lisp/autoload.el (autoload-generate-file-autoloads): Be careful * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Be careful
with EOLs when generating MD5 checksums. with EOLs when generating MD5 checksums.
* follow.el: Don't change the global map from the follow-mode-map * follow.el: Don't change the global map from the follow-mode-map
defvar, but from the toplevel. Use easy-menu to unify the Emacs and defvar, but from the toplevel. Use easy-menu to unify the Emacs and
XEmacs code. XEmacs code.
......
...@@ -652,7 +652,7 @@ is nil, ask the user where to save the desktop." ...@@ -652,7 +652,7 @@ is nil, ask the user where to save the desktop."
(set-buffer buffer) (set-buffer buffer)
(list (list
;; basic information ;; basic information
(desktop-file-name (buffer-file-name) dirname) (desktop-file-name (buffer-file-name) desktop-dirname)
(buffer-name) (buffer-name)
major-mode major-mode
;; minor modes ;; minor modes
...@@ -673,7 +673,7 @@ is nil, ask the user where to save the desktop." ...@@ -673,7 +673,7 @@ is nil, ask the user where to save the desktop."
buffer-read-only buffer-read-only
;; auxiliary information ;; auxiliary information
(when (functionp desktop-save-buffer) (when (functionp desktop-save-buffer)
(funcall desktop-save-buffer dirname)) (funcall desktop-save-buffer desktop-dirname))
;; local variables ;; local variables
(let ((locals desktop-locals-to-save) (let ((locals desktop-locals-to-save)
(loclist (buffer-local-variables)) (loclist (buffer-local-variables))
...@@ -896,7 +896,7 @@ See also `desktop-base-file-name'." ...@@ -896,7 +896,7 @@ See also `desktop-base-file-name'."
(insert "\n " (desktop-value-to-string e))) (insert "\n " (desktop-value-to-string e)))
(insert ")\n\n"))) (insert ")\n\n")))
(setq default-directory dirname) (setq default-directory desktop-dirname)
(let ((coding-system-for-write 'emacs-mule)) (let ((coding-system-for-write 'emacs-mule))
(write-region (point-min) (point-max) (desktop-full-file-name) nil 'nomessage)) (write-region (point-min) (point-max) (desktop-full-file-name) nil 'nomessage))
;; We remember when it was modified (which is presumably just now). ;; We remember when it was modified (which is presumably just now).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment