1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-28 10:56:36 +00:00
Commit Graph

122 Commits

Author SHA1 Message Date
Miles Bader
ba69b876ac Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 138-139)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-914
2007-10-30 23:28:12 +00:00
Michael Olson
f2168a4cda Revert bad erc-track change; ignore erc-track-minor-mode properly in desktop
* lisp/desktop.el (desktop-minor-mode-table): Add line for ERC.
2007-10-30 00:50:07 +00:00
Juanma Barranquero
8f3f313d13 (desktop-load-locked-desktop, desktop-base-lock-name, desktop-not-loaded-hook):
Fix :version tags.
2007-10-27 17:14:37 +00:00
Juanma Barranquero
93c5a976a0 (uniquify-managed): Pacify byte compiler.
(desktop-buffer-info): If the buffer name is managed by uniquify,
save the base name, not the uniquified one.
(desktop-create-buffer): Allow `rename-buffer' to generate a new
name in case of conflict.
2007-10-27 17:11:45 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Juanma Barranquero
eca04a35d2 (desktop-buffer-info, desktop-save): Use desktop-dirname' instead of dirname'. 2007-07-12 22:47:51 +00:00
Juanma Barranquero
9e29c91ca3 (desktop-buffer-info, desktop-save): Use desktop-dirname' instead of dirname'. 2007-07-12 22:40:00 +00:00
Juanma Barranquero
3ae6b03fe6 (desktop-read): Run `desktop-not-loaded-hook' in the directory where the desktop
file was found, as the docstring says.
(desktop-kill): Use `read-directory-name'.
 (desktop-load-locked-desktop): New option.
(desktop-read): Use it.
(desktop-truncate, desktop-outvar, desktop-restore-file-buffer): Use `when'.
(desktop-save-mode-off): New function.
(desktop-base-lock-name, desktop-not-loaded-hook): New variables.
(desktop-full-lock-name, desktop-file-modtime, desktop-owner,
desktop-claim-lock, desktop-release-lock): New functions.
(desktop-kill): Tell `desktop-save' that this is the last save.
Release the lock afterwards.
(desktop-buffer-info): New function.
(desktop-save): Use it.  Run `desktop-save-hook' where the doc says to.
Detect conflicts, and manage the lock.
(desktop-read): Detect conflicts.  Manage the lock.
2007-06-24 20:03:06 +00:00
Juanma Barranquero
794855cae2 (desktop-read): Run `desktop-not-loaded-hook' in the directory
where the desktop file was found, as the docstring says.
(desktop-kill): Use `read-directory-name'.
2007-06-20 10:12:44 +00:00
Juanma Barranquero
1f7efe1ba6 (desktop-load-locked-desktop): New option.
(desktop-read): Use it.
(desktop-truncate, desktop-outvar, desktop-restore-file-buffer): Use `when'.
2007-06-12 11:14:52 +00:00
Juanma Barranquero
e88110dbfc (desktop-save-mode-off): New function.
(desktop-base-lock-name, desktop-not-loaded-hook): New variables.
(desktop-full-lock-name, desktop-file-modtime, desktop-owner,
desktop-claim-lock, desktop-release-lock): New functions.
(desktop-kill): Tell `desktop-save' that this is the last save.
Release the lock afterwards.
(desktop-buffer-info): New function.
(desktop-save): Use it.  Run `desktop-save-hook' where the doc says to.
Detect conflicts, and manage the lock.
(desktop-read): Detect conflicts.  Manage the lock.
2007-06-12 09:11:31 +00:00
Juanma Barranquero
b258555dcb (desktop-minor-mode-table): Doc fix. 2007-06-09 00:13:10 +00:00
Juanma Barranquero
7d6ee4dfc6 (desktop-minor-mode-table): Doc fix. 2007-06-09 00:09:03 +00:00
Stefan Monnier
341c2f07d4 (desktop-save, desktop-create-buffer): Replace mapcar with dolist.
(after-init-hook): Don't quote lambda.
(desktop-first-buffer): Don't wrap it in eval-when-compile.
(desktop-internal-v2s): Remove unused var `el'.
(desktop-buffer-major-mode, desktop-buffer-locals): Move out of
desktop-restore-file-buffer.
(desktop-buffer-ok-count, desktop-buffer-fail-count): Move out of
desktop-create-buffer.
2007-04-11 02:28:26 +00:00
Chong Yidong
c5c1022d71 (desktop-create-buffer, desktop-save): Revert 2004-11-12 change. 2007-04-06 18:35:23 +00:00
Lars Hansen
f6218c044c *** empty log message *** 2007-02-28 08:59:40 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Lars Hansen
4cffefee99 Add comment. 2006-09-12 07:13:52 +00:00
David Kastrup
e24f9e5a68 (desktop-read): when loading a desktop, disable
saving it while the load progresses, and switch off a pending lazy
load by calling `desktop-lazy-abort'.
2006-09-08 19:47:27 +00:00
Lars Hansen
114258349c (desktop-full-file-name): New function.
(desktop-kill, desktop-save, desktop-remove, desktop-read)
(desktop-revert): Use it.
(desktop-clear, desktop-save, desktop-remove): Add autoload cookie.
(desktop-after-read-hook): Add option list-buffers.
(desktop-locals-to-save): Add tab-width.
(desktop-save-mode, desktop-no-desktop-file-hook, desktop-save-hook):
Fix docstring.
2006-06-23 21:42:33 +00:00
Lars Hansen
6c27fdb95d (desktop-missing-file-warning): Fix docstring.
(desktop-restore-file-buffer): Correct question asked on missing file.
2006-05-14 20:26:37 +00:00
Lars Hansen
9fbcde29a5 (desktop-save): Use with-temp-buffer. 2006-05-13 13:32:10 +00:00
Juanma Barranquero
be617bbf58 (desktop-outvar): Fix typo.
(desktop-save-buffer-p): Doc fix.
2006-02-10 11:07:50 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Juri Linkov
07696982f1 (desktop-load-file): Check for fboundp' before calling symbol-function'. 2006-01-23 01:23:10 +00:00
Juri Linkov
5fff026521 (desktop-minor-mode-table): Add vc-dired-mode with nil. 2005-12-14 07:44:44 +00:00
Juri Linkov
df410295ca (desktop-buffers-not-to-save): Remove TAGS from the default value.
(desktop-modes-not-to-save): Add tags-table-mode to the default value.
2005-10-21 08:48:53 +00:00
Lars Hansen
97b3a2143e (desktop-load-file): Do nothing when FUNCTION is nil. 2005-10-12 09:16:55 +00:00
Deepak Goel
8a26c16552 Message format spec fixes (1) 2005-09-18 12:25:02 +00:00
Andreas Schwab
498eb267ff Put autoload cookie at risky-local-variable declarations. 2005-08-14 23:55:03 +00:00
Lars Hansen
0f4804e7eb (desktop-buffer-mode-handlers): Make
non-customizable. Add autoload cookie.  Change initial value to
nil; add elements in respective modules instead. Fix doc string.
(desktop-load-file): New function.
(desktop-minor-mode-handlers): New autoloaded variable.
(desktop-create-buffer): Call minor mode handlers. Use
desktop-load-file to load major and minor mode modules prior to
checking for a handler.
(desktop-save): Don't add nil to desktop-minor-modes for minor
modes with nil function in desktop-minor-mode-table. Don't delete
desktop file before rewriting it.
(desktop-locals-to-save): Add autoload cookie. Don't make
automatically buffer-local.  Add variables column-number-mode,
size-indication-mode, indent-tabs-mode,
indicate-buffer-boundaries, indicate-empty-lines and
show-trailing-whitespace.
(desktop-clear): Allow desktop-clear-preserve-buffers to contain
regexps. Don't use desktop-clear-preserve-buffers-regexp.
(desktop-clear-preserve-buffers-regexp): Delete.
(desktop-clear-preserve-buffers): Update initial value and
docstring.
(desktop-save-buffer): Fix doc string.
2005-08-10 19:38:52 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Juanma Barranquero
b89c5a722e (desktop-save-buffer): Fix typos in docstring.
(desktop-load-default): Simplify.
2005-07-29 10:25:15 +00:00
Juanma Barranquero
4880a2744a (desktop-clear-preserve-buffers-regexp): Also preserve the *server* buffer. 2005-07-21 11:50:38 +00:00
Juanma Barranquero
3f32d6a3ed (desktop-enable, desktop-basefilename): Declare with
`define-obsolete-variable-alias'.
(desktop-internal-v2s): Don't quote keywords.
(desktop-clear): "?\ " -> "?\s".
2005-07-19 23:42:38 +00:00
Juanma Barranquero
cc8b76bf86 (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 09:54:05 +00:00
Lars Hansen
247c36494f Update e-mail address. 2005-07-12 18:05:09 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Lars Hansen
4b217d4608 Make "--no-desktop" turn off `desktop-save-mode'. 2005-04-18 18:27:39 +00:00
Lute Kamstra
8649a87bb4 (desktop-no-desktop-file-hook, desktop-after-read-hook): Fix docstring. 2005-04-03 14:01:43 +00:00
Kim F. Storm
bf247b6ed0 Change release version from 21.4 to 22.1 throughout.
Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
Juri Linkov
aac42a1b2c (desktop-save): Add `mode: emacs-lisp' to the local
variables line in desktop files.
2005-01-12 00:52:33 +00:00
David Kastrup
0ba9bc53bd (desktop-restore-eager): Fix typo in type. 2005-01-09 13:31:53 +00:00
Lars Hansen
150f39ee71 (desktop-restore-eager, desktop-lazy-verbose, desktop-lazy-idle-delay):
New customizable variables.
(desktop-buffer-args-list): New variable.
(desktop-append-buffer-args): New function.
(desktop-save): Call desktop-append-buffer-args for some buffers.
(desktop-lazy-create-buffer): New function.
(desktop-idle-create-buffers): New function.
(desktop-read): Add message about buffers to restore lazily.
(desktop-lazy-abort): New command.
(desktop-clear): Call desktop-lazy-abort.
(desktop-lazy-complete): New command.
2005-01-07 20:18:59 +00:00
Lars Hansen
48aa4dfc27 (desktop-read): Replace mapcar with mapc.
(desktop-create-buffer): Replace mapcar with mapc. Remove redundant piece of code.
2004-11-26 17:37:58 +00:00
Eli Zaretskii
63cd573484 (desktop-create-buffer, desktop-save): Avoid some consing by using mapc
instead of mapcar.
2004-11-12 16:56:09 +00:00
Lars Hansen
af61551b5e (desktop-buffer-mode-handlers, desktop-after-read-hook,
desktop-clear-preserve-buffers-regexp, desktop-file-name-format,
desktop-globals-to-clear, desktop-no-desktop-file-hook, desktop-path,
desktop-save): Add :version.
2004-11-11 19:02:56 +00:00
Lars Hansen
340db502fa (desktop-clear-preserve-buffers): Remove make-obsolete-variable. 2004-09-09 19:45:03 +00:00
Lars Hansen
7bfa55b358 (desktop-save): Don't save minor modes without a known mode initialization function. 2004-05-31 21:45:51 +00:00