Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
9e29c91c
Commit
9e29c91c
authored
Jul 12, 2007
by
Juanma Barranquero
Browse files
(desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'.
parent
9c0a6042
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
lisp/ChangeLog
lisp/ChangeLog
+5
-1
lisp/desktop.el
lisp/desktop.el
+3
-3
No files found.
lisp/ChangeLog
View file @
9e29c91c
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>
* progmodes/which-func.el (which-func-modes): Add `python-mode'.
...
...
@@ -94,7 +99,6 @@
* emacs-lisp/autoload.el (autoload-generate-file-autoloads): Be careful
with EOLs when generating MD5 checksums.
* 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
XEmacs code.
...
...
lisp/desktop.el
View file @
9e29c91c
...
...
@@ -652,7 +652,7 @@ is nil, ask the user where to save the desktop."
(
set-buffer
buffer
)
(
list
;; basic information
(
desktop-file-name
(
buffer-file-name
)
dirname
)
(
desktop-file-name
(
buffer-file-name
)
desktop-
dirname
)
(
buffer-name
)
major-mode
;; minor modes
...
...
@@ -673,7 +673,7 @@ is nil, ask the user where to save the desktop."
buffer-read-only
;; auxiliary information
(
when
(
functionp
desktop-save-buffer
)
(
funcall
desktop-save-buffer
dirname
))
(
funcall
desktop-save-buffer
desktop-
dirname
))
;; local variables
(
let
((
locals
desktop-locals-to-save
)
(
loclist
(
buffer-local-variables
))
...
...
@@ -896,7 +896,7 @@ See also `desktop-base-file-name'."
(
insert
"\n "
(
desktop-value-to-string
e
)))
(
insert
")\n\n"
)))
(
setq
default-directory
dirname
)
(
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).
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment