Commit cc8b76bf authored by Juanma Barranquero's avatar Juanma Barranquero

(desktop-enable, desktop-buffer-modes-to-save, (desktop-buffer-misc-functions,

desktop-buffer-handlers, desktop-load-default): Add release to obsolescence
info.
(desktop-globals-to-clear, desktop-buffer-mode-handlers,
desktop-append-buffer-args, desktop-read): Fix typos in docstrings.
(desktop-kill): Fix typo in message.
(desktop-save): Doc fix.
parent 25fd144d
2005-07-19 Juanma Barranquero <lekktu@gmail.com>
* desktop.el (desktop-enable, desktop-buffer-modes-to-save)
(desktop-buffer-misc-functions, desktop-buffer-handlers)
(desktop-load-default): Add release to obsolescence info.
(desktop-globals-to-clear, desktop-buffer-mode-handlers)
(desktop-append-buffer-args, desktop-read):
Fix typos in docstrings.
(desktop-kill): Fix typo in message.
(desktop-save): Doc fix.
2005-07-19 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-escape-to-state): bug fix
(viper-envelop-ESC-key): changed the definition of fast keysequence so
it'll work with keyboard macros
* ediff.el (ediff-patch-buffer): changed the docstring.
* viper-cmd.el (viper-escape-to-state): Bug fix.
(viper-envelop-ESC-key): Change the definition of fast
keysequence so it'll work with keyboard macros.
* ediff.el (ediff-patch-buffer): Change the docstring.
2005-07-19 Kenichi Handa <handa@m17n.org>
* international/mule-cmds.el (select-safe-coding-system): Try to
......
......@@ -107,7 +107,7 @@ desktop is saved."
;; Maintained for backward compatibility
(defvaralias 'desktop-enable 'desktop-save-mode)
(make-obsolete-variable 'desktop-enable 'desktop-save-mode)
(make-obsolete-variable 'desktop-enable 'desktop-save-mode "22.1")
(defcustom desktop-save 'ask-if-new
"*Specifies whether the desktop should be saved when it is killed.
......@@ -120,7 +120,7 @@ Possible values are:
if-exists -- save if desktop file exists, otherwise don't save.
nil -- never save.
The desktop is never saved when `desktop-save-mode' is nil.
The variables `desktop-directory' and `desktop-base-file-name'
The variables `desktop-dirname' and `desktop-base-file-name'
determine where the desktop is saved."
:type '(choice
(const :tag "Always save" t)
......@@ -200,8 +200,8 @@ Feature: Saving `kill-ring' implies saving `kill-ring-yank-pointer'."
regexp-search-ring-yank-pointer)
"List of global variables that `desktop-clear' will clear.
An element may be variable name (a symbol) or a cons cell of the form
\(VAR . FORM). Symbols are set to nil and for cons cells VAR is set
to the value obtained by evaluateing FORM."
\(VAR . FORM). Symbols are set to nil and for cons cells VAR is set
to the value obtained by evaluating FORM."
:type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
:group 'desktop
:version "22.1")
......@@ -305,9 +305,9 @@ to restore the buffer, the auxiliary information is passed as the argument
DESKTOP-BUFFER-MISC.")
(make-variable-buffer-local 'desktop-save-buffer)
(make-obsolete-variable 'desktop-buffer-modes-to-save
'desktop-save-buffer)
'desktop-save-buffer "22.1")
(make-obsolete-variable 'desktop-buffer-misc-functions
'desktop-save-buffer)
'desktop-save-buffer "22.1")
(defcustom desktop-buffer-mode-handlers
'((dired-mode . dired-restore-desktop-buffer)
......@@ -315,7 +315,7 @@ DESKTOP-BUFFER-MISC.")
(mh-folder-mode . mh-restore-desktop-buffer)
(Info-mode . Info-restore-desktop-buffer))
"Alist of major mode specific functions to restore a desktop buffer.
Functions are called by `desktop-read'. List elements must have the form
Functions are called by `desktop-read'. List elements must have the form
\(MAJOR-MODE . RESTORE-BUFFER-FUNCTION).
Buffers with a major mode not specified here, are restored by the default
......@@ -342,7 +342,7 @@ and variable values for that buffer are copied into it."
(put 'desktop-buffer-mode-handlers 'risky-local-variable t)
(make-obsolete-variable 'desktop-buffer-handlers
'desktop-buffer-mode-handlers)
'desktop-buffer-mode-handlers "22.1")
(defcustom desktop-minor-mode-table
'((auto-fill-function auto-fill-mode)
......@@ -432,7 +432,7 @@ is nil, ask the user where to save the desktop."
(condition-case err
(desktop-save desktop-dirname)
(file-error
(unless (yes-or-no-p "Error while saving the desktop. Ignore? ")
(unless (yes-or-no-p "Error while saving the desktop. Ignore? ")
(signal (car err) (cdr err)))))))
;; ----------------------------------------------------------------------------
......@@ -711,7 +711,7 @@ This function also sets `desktop-dirname' to nil."
"Read and process the desktop file in directory DIRNAME.
Look for a desktop file in DIRNAME, or if DIRNAME is omitted, look in
directories listed in `desktop-path'. If a desktop file is found, it
is processed and `desktop-after-read-hook' is run. If no desktop file
is processed and `desktop-after-read-hook' is run. If no desktop file
is found, clear the desktop and run `desktop-no-desktop-file-hook'.
This function is a no-op when Emacs is running in batch mode.
It returns t if a desktop file was loaded, nil otherwise."
......@@ -781,7 +781,7 @@ Also inhibit further loading of it."
(progn
(load "default" t t)
(setq inhibit-default-init t))))
(make-obsolete 'desktop-load-default 'desktop-save-mode)
(make-obsolete 'desktop-load-default 'desktop-save-mode "22.1")
;; ----------------------------------------------------------------------------
;;;###autoload
......@@ -958,7 +958,7 @@ directory DIRNAME."
(cons 'overwrite-mode (car mim)))))
(defun desktop-append-buffer-args (&rest args)
"Append ARGS at end of `desktop-buffer-args-list'
"Append ARGS at end of `desktop-buffer-args-list'.
ARGS must be an argument list for `desktop-create-buffer'."
(setq desktop-buffer-args-list (nconc desktop-buffer-args-list (list args)))
(unless desktop-lazy-timer
......
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