summaryrefslogtreecommitdiff
path: root/doc/lispintro
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-02-01 13:39:33 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2010-02-01 13:39:33 -0500
commitcd61af01c1220b6a7f98189c826edc7535416583 (patch)
tree9a29094049a97b153b162a639cfea4381b9cf0f2 /doc/lispintro
parent0bca393f91b3e6140b02d0eb9ee56f8bcdaac365 (diff)
downloademacs-cd61af01c1220b6a7f98189c826edc7535416583.tar.gz
Avoid obsolete special default variables like default-major-mode.
* display.texi (Line Height): * emacs-lisp-intro.texi (Text and Auto-fill, Mode Line): * display.texi (Useless Whitespace, Text Display): * custom.texi (Init Examples): Avoid obsolete special default variables like default-major-mode.
Diffstat (limited to 'doc/lispintro')
-rw-r--r--doc/lispintro/ChangeLog5
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi12
2 files changed, 11 insertions, 6 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 38332c4a1d9..c22d7523fa0 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-01 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * emacs-lisp-intro.texi (Text and Auto-fill, Mode Line):
+ Avoid obsolete special default variables like default-major-mode.
+
2009-12-09 David Robinow <drobinow@gmail.com> (tiny change)
* makefile.w32-in: Use parenthesis for macros for nmake
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 4504a99f267..5efbb81ee1b 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -17346,10 +17346,10 @@ Auto Fill mode.
@smallexample
@group
;;; Text mode and Auto Fill mode
-; The next two lines put Emacs into Text mode
-; and Auto Fill mode, and are for writers who
-; want to start writing prose rather than code.
-(setq default-major-mode 'text-mode)
+;; The next two lines put Emacs into Text mode
+;; and Auto Fill mode, and are for writers who
+;; want to start writing prose rather than code.
+(setq-default major-mode 'text-mode)
(add-hook 'text-mode-hook 'turn-on-auto-fill)
@end group
@end smallexample
@@ -18257,7 +18257,7 @@ xmodmap -e "keysym Alt_L = Meta_L Alt_L"
@need 1700
@node Mode Line, , Miscellaneous, Emacs Initialization
@section A Modified Mode Line
-@vindex default-mode-line-format
+@vindex mode-line-format
@cindex Mode line format
Finally, a feature I really like: a modified mode line.
@@ -18282,7 +18282,7 @@ My @file{.emacs} file has a section that looks like this:
@group
;; Set a Mode Line that tells me which machine, which directory,
;; and which line I am on, plus the other customary information.
-(setq default-mode-line-format
+(setq-default mode-line-format
(quote
(#("-" 0 1
(help-echo