1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-20 12:40:56 -08:00
Commit graph

192 commits

Author SHA1 Message Date
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
Miles Bader
991a760232 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 698-710)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 216)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
2007-04-24 21:56:25 +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
Miles Bader
57cb2e6f26 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 675-697)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Release ERC 5.2.

 * gnus--rel--5.10  (patch 211-215)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
2007-04-11 00:17:47 +00:00
Chong Yidong
c5c1022d71 (desktop-create-buffer, desktop-save): Revert 2004-11-12 change. 2007-04-06 18:35:23 +00:00
Miles Bader
70fff7b100 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 653-661)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 203-206)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-180
2007-03-04 06:19:40 +00:00
Lars Hansen
f6218c044c *** empty log message *** 2007-02-28 08:59:40 +00:00
Miles Bader
c0466914ba Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
2007-01-26 06:16:11 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Miles Bader
863153c57b Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 427-436)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 134-136)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-110
2006-09-14 09:24:00 +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
Miles Bader
6a46b01883 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 320-342)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - lisp/play/cookie1.el (cookie): Work properly when there's only one entry
   - Add note about "link" button-class to etc/TODO

 * gnus--rel--5.10  (patch 108-112)

   - Merge from emacs--devo--0
   - Clean up merge mistakes
   - Update from CVS
   - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
2006-07-06 08:59:39 +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
Miles Bader
4ed925c668 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 274-284)

   - Update from CVS
   - Update etc/MORE.STUFF.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 101)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
2006-05-17 07:46:49 +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
Miles Bader
0b12547529 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-14
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 58-65)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 22-28)

   - Update from CVS
   - Merge from emacs--devo--0
   - Update from CVS: lisp/gnus.el: Remove bogus comment.
2006-02-11 00:11:19 +00:00
Juanma Barranquero
be617bbf58 (desktop-outvar): Fix typo.
(desktop-save-buffer-p): Doc fix.
2006-02-10 11:07:50 +00:00
Miles Bader
380874900c Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

   - Update from CVS
   - Merge from emacs--devo--0
2006-02-08 04:26:44 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Miles Bader
b2ba4dcba1 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 4-14)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (base, patch 1-7)

   - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   - Update from CVS
   - Merge from emacs--devo--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 187)

   - Update from CVS
2006-01-25 07:10:04 +00:00
Juri Linkov
07696982f1 (desktop-load-file): Check for fboundp' before calling symbol-function'. 2006-01-23 01:23:10 +00:00
Miles Bader
41882805d6 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 616-696)

   - Add lisp/mh-e/.arch-inventory
   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
   - lisp/gnus/ChangeLog: Remove duplicate entry

 * gnus--rel--5.10  (patch 147-181)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: lisp/mml.el (mml-preview): Doc fix.
   - Update from CVS: texi/message.texi: Fix default values.
   - Update from CVS: texi/gnus.texi (RSS): Addition.
2006-01-16 08:37:27 +00:00
Miles Bader
6a2bd1a501 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-95
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 598-615)

   - Update from CVS
   - Remove lisp/toolbar directory
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 142-146)

   - Update from CVS
2006-01-16 06:59:21 +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
Miles Bader
9fe76e1b25 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-91
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 581-597)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 133-141)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: texi/gnus.texi (RSS): Fix key description.
   - Update from CVS: texi/gnus.texi (Document Server Internals): Addition.
2005-10-15 00:26:05 +00:00
Lars Hansen
97b3a2143e (desktop-load-file): Do nothing when FUNCTION is nil. 2005-10-12 09:16:55 +00:00
Miles Bader
6f512f0b53 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 542-553)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 116-121)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
2005-09-19 10:20:33 +00:00
Deepak Goel
8a26c16552 Message format spec fixes (1) 2005-09-18 12:25:02 +00:00
Miles Bader
d4cccb1406 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 514-518)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 104-105)

   - Update from CVS
2005-08-26 09:51:52 +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
Miles Bader
5e10f34207 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-77
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 504-513)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: .cvsignore: Add `lock'.

 * gnus--rel--5.10  (patch 99-103)

   - Update from CVS
2005-08-05 10:57:36 +00:00
Juanma Barranquero
b89c5a722e (desktop-save-buffer): Fix typos in docstring.
(desktop-load-default): Simplify.
2005-07-29 10:25:15 +00:00
Miles Bader
3674ae2f87 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 485-492)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 92-94)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
2005-07-22 08:27:27 +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
Miles Bader
bacb9790f5 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 474-484)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 88-91)

   - Merge from emacs--cvs-trunk--0
   - Update FSF's address in GPL notices
   - Update from CVS
2005-07-14 08:02:00 +00:00
Lars Hansen
247c36494f Update e-mail address. 2005-07-12 18:05:09 +00:00
Miles Bader
d3e4babdd1 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 459-473)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 86-87)

   - Update from CVS
2005-07-07 12:43:14 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Miles Bader
135f59d513 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-39
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 258-271)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 66)

   - Update from CVS
2005-04-21 05:59:53 +00:00
Lars Hansen
4b217d4608 Make "--no-desktop" turn off `desktop-save-mode'. 2005-04-18 18:27:39 +00:00
Miles Bader
768d4533ce Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 228-240)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 53-58)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
   - Collapse feature addition/removal within single ChangeLog entry
2005-04-09 02:16:29 +00:00
Lute Kamstra
8649a87bb4 (desktop-no-desktop-file-hook, desktop-after-read-hook): Fix docstring. 2005-04-03 14:01:43 +00:00