From cd61af01c1220b6a7f98189c826edc7535416583 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 1 Feb 2010 13:39:33 -0500 Subject: [PATCH] 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. --- doc/emacs/ChangeLog | 6 ++++++ doc/emacs/custom.texi | 2 +- doc/emacs/display.texi | 17 +++++++---------- doc/lispintro/ChangeLog | 5 +++++ doc/lispintro/emacs-lisp-intro.texi | 12 ++++++------ doc/lispref/ChangeLog | 5 +++++ doc/lispref/display.texi | 1 - 7 files changed, 30 insertions(+), 18 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 39ffa2c2ac..a039e632d5 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2010-02-01 Stefan Monnier + + * display.texi (Useless Whitespace, Text Display): + * custom.texi (Init Examples): Avoid obsolete special default variables + like default-major-mode. + 2010-01-24 Mark A. Hershberger * programs.texi (Other C Commands): Replace reference to obsolete diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index a7e74388a3..a491453119 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -2275,7 +2275,7 @@ Various Emacs packages that need your own email address use the value of Make Text mode the default mode for new buffers. @example -(setq default-major-mode 'text-mode) +(setq-default major-mode 'text-mode) @end example Note that @code{text-mode} is used because it is the command for diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index c7afe5445a..a5d064e578 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -877,7 +877,6 @@ portion (@pxref{Narrowing}), type @kbd{M-x delete-trailing-whitespace @key{RET}}. This command does not remove newline characters. @vindex indicate-empty-lines -@vindex default-indicate-empty-lines @cindex unused lines @cindex fringes, and unused line indication Emacs can indicate unused lines at the end of the window with a @@ -887,11 +886,11 @@ lines at the end of the buffer then stand out because they do not have this image in the fringe. To enable this feature, set the buffer-local variable -@code{indicate-empty-lines} to a non-@code{nil} value. The default -value of this variable is controlled by the variable -@code{default-indicate-empty-lines}; by setting that variable, you -can enable or disable this feature for all new buffers. (This feature -currently doesn't work on text-only terminals.) +@code{indicate-empty-lines} to a non-@code{nil} value. You can enable +or disable this feature for all new buffers by setting the default +value of this variable, e.g.@: @code{(setq-default +indicate-empty-lines t)};. (This feature currently doesn't work on +text-only terminals.) @node Selective Display @section Selective Display @@ -1083,17 +1082,15 @@ buffers are displayed with their graphics, as are non-@acronym{ASCII} multibyte printing characters (octal codes above 0400). @vindex tab-width -@vindex default-tab-width Some @acronym{ASCII} control characters are displayed in special ways. The newline character (octal code 012) is displayed by starting a new line. The tab character (octal code 011) is displayed by moving to the next tab stop column (normally every 8 columns). The number of spaces per tab is controlled by the variable @code{tab-width}, which must have an integer value between 1 and 1000, inclusive, and is made -local by changing it. Note that how the tab character in the buffer +buffer-local by changing it. Note that how the tab character in the buffer is displayed has nothing to do with the definition of @key{TAB} as a -command. The variable @code{default-tab-width} controls the default -value of this variable for buffers where you have not set it locally. +command. Other @acronym{ASCII} control characters are normally displayed as a caret (@samp{^}) followed by the non-control version of the character; thus, diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 38332c4a1d..c22d7523fa 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,8 @@ +2010-02-01 Stefan Monnier + + * emacs-lisp-intro.texi (Text and Auto-fill, Mode Line): + Avoid obsolete special default variables like default-major-mode. + 2009-12-09 David Robinow (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 4504a99f26..5efbb81ee1 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 diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 58c801f5ca..f155c9575f 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2010-02-01 Stefan Monnier + + * display.texi (Line Height): Avoid obsolete special default variables + like default-major-mode. + 2010-01-28 Alan Mackenzie * display.texi (Auto Faces): Say fontification-functions is called diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 5f2e4f874a..91a71c54a6 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -1768,7 +1768,6 @@ height consists of the contents' height plus the line spacing. There are several ways to specify the line spacing for different parts of Emacs text. -@vindex default-line-spacing On graphical terminals, you can specify the line spacing for all lines in a frame, using the @code{line-spacing} frame parameter (@pxref{Layout Parameters}). However, if the default value of -- 2.20.1