aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-04-28 08:06:51 +0000
committerJuanma Barranquero2008-04-28 08:06:51 +0000
commitfb8a6326537d41cabfbb8528dbc5fcfbb65c2f0f (patch)
tree34807382c47c28a3defd93cebbc9da504ad6d72c
parent96cfaafc9c432f8965f66d004cc628bacdcceecf (diff)
downloademacs-fb8a6326537d41cabfbb8528dbc5fcfbb65c2f0f.tar.gz
emacs-fb8a6326537d41cabfbb8528dbc5fcfbb65c2f0f.zip
(desktop-minor-mode-table): Add `savehist-mode'.
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/desktop.el5
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f18fc1c1ae6..1354d31c95b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-04-28 Juanma Barranquero <lekktu@gmail.com>
2
3 * desktop.el (desktop-minor-mode-table): Add `savehist-mode'.
4
12008-04-27 Dan Nicolaescu <dann@ics.uci.edu> 52008-04-27 Dan Nicolaescu <dann@ics.uci.edu>
2 6
3 * vc.el (vc-dir-mode-map): Change bindings for unmark all and revert. 7 * vc.el (vc-dir-mode-map): Change bindings for unmark all and revert.
@@ -515,8 +519,8 @@
515 519
5162008-04-24 Michael Albinus <michael.albinus@gmx.de> 5202008-04-24 Michael Albinus <michael.albinus@gmx.de>
517 521
518 * net/tramp.el (tramp-get-remote-stat): Test whether stat supports 522 * net/tramp.el (tramp-get-remote-stat): Test whether stat supports %s.
519 %s. Reported by Loris Bennett <loris.bennett@fu-berlin.de>. 523 Reported by Loris Bennett <loris.bennett@fu-berlin.de>.
520 524
5212008-04-24 Sam Steingold <sds@gnu.org> 5252008-04-24 Sam Steingold <sds@gnu.org>
522 526
@@ -2697,7 +2701,7 @@
2697 (hilit-chg-set-face-on-change, hilit-chg-update) 2701 (hilit-chg-set-face-on-change, hilit-chg-update)
2698 (highlight-changes-rotate-faces): Use highlight-changes-visible-mode 2702 (highlight-changes-rotate-faces): Use highlight-changes-visible-mode
2699 variable instead of testing highlight-changes-mode. 2703 variable instead of testing highlight-changes-mode.
2700 (highlight-markup-buffers): Add reuire ediff-util; argument on calls 2704 (highlight-markup-buffers): Add require ediff-util; argument on calls
2701 to highlight-changes-mode changed. 2705 to highlight-changes-mode changed.
2702 (highlight-compare-with-file): Fix problems with interactive 2706 (highlight-compare-with-file): Fix problems with interactive
2703 call giving invalid default file. 2707 call giving invalid default file.
diff --git a/lisp/desktop.el b/lisp/desktop.el
index b126925c467..7aa360cc479 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -84,7 +84,7 @@
84;; (add-to-list 'desktop-minor-mode-handlers 84;; (add-to-list 'desktop-minor-mode-handlers
85;; '(bar-mode . bar-desktop-restore)) 85;; '(bar-mode . bar-desktop-restore))
86 86
87;; in the module itself, and make shure that the mode function is 87;; in the module itself, and make sure that the mode function is
88;; autoloaded. See the docstrings of `desktop-buffer-mode-handlers' and 88;; autoloaded. See the docstrings of `desktop-buffer-mode-handlers' and
89;; `desktop-minor-mode-handlers' for more info. 89;; `desktop-minor-mode-handlers' for more info.
90 90
@@ -456,7 +456,8 @@ Furthermore the major mode function must be autoloaded.")
456 '((auto-fill-function auto-fill-mode) 456 '((auto-fill-function auto-fill-mode)
457 (vc-mode nil) 457 (vc-mode nil)
458 (vc-dired-mode nil) 458 (vc-dired-mode nil)
459 (erc-track-minor-mode nil)) 459 (erc-track-minor-mode nil)
460 (savehist-mode nil))
460 "Table mapping minor mode variables to minor mode functions. 461 "Table mapping minor mode variables to minor mode functions.
461Each entry has the form (NAME RESTORE-FUNCTION). 462Each entry has the form (NAME RESTORE-FUNCTION).
462NAME is the name of the buffer-local variable indicating that the minor 463NAME is the name of the buffer-local variable indicating that the minor