emacs: lisp/desktop.el comparison

comparison lisp/desktop.el @ 64490:e22e42dbaf76

(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.

author	Juanma Barranquero <lekktu@gmail.com>
date	Tue, 19 Jul 2005 09:52:55 +0000
parents	f2bb50c9b2dd
children	a9ca2e64f9c1

comparison

equal deleted inserted replaced

-:86ac75fb6283
+:e22e42dbaf76
 :global t
 :group 'desktop)
 ;; 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.
 A desktop is killed when the user changes desktop or quits Emacs.
 Possible values are:
 ask-if-new    -- ask if no desktop file exists, otherwise just save.
 ask-if-exists -- ask if desktop file exists, otherwise don't save.
 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)
 (const :tag "Always ask" ask)
 (const :tag "Ask if desktop file is new, else do save" ask-if-new)
 search-ring-yank-pointer
 regexp-search-ring
 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
+\(VAR . FORM).  Symbols are set to nil and for cons cells VAR is set
-to the value obtained by evaluateing FORM."
+to the value obtained by evaluating FORM."
 :type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
 :group 'desktop
 :version "22.1")
 (defcustom desktop-clear-preserve-buffers-regexp
 Later, when `desktop-read' calls a function in `desktop-buffer-mode-handlers'
 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)
 (rmail-mode . rmail-restore-desktop-buffer)
 (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
 handler `desktop-restore-file-buffer'.
 :type 'alist
 :group 'desktop)
 (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)
 (vc-mode nil))
 "Table mapping minor mode variables to minor mode functions.
 (call-interactively
 (lambda (dir) (interactive "DDirectory for desktop file: ") dir))))))
 (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)))))))
 ;; ----------------------------------------------------------------------------
 (defun desktop-list* (&rest args)
 (if (null (cdr args))
 ;;;###autoload
 (defun desktop-read (&optional dirname)
 "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."
 (interactive)
 (unless noninteractive
 Also inhibit further loading of it."
 (if (not inhibit-default-init)	; safety check
 (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
 (defun desktop-change-dir (dirname)
 "Change to desktop saved in DIRNAME.
 			       (cons 'case-fold-search cfs)
 			       (cons 'case-replace cr)
 			       (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
 (setq desktop-lazy-timer
 (run-with-idle-timer desktop-lazy-idle-delay t 'desktop-idle-create-buffers))))

Mercurial > emacs

comparison lisp/desktop.el @ 64490:e22e42dbaf76