Mercurial > emacs
changeset 104095:5b0ac40cc7c1
* emacs-lisp-intro.texi (Simple Extension): Bump emacs versions in
examples.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 28 Jul 2009 15:08:17 +0000 |
| parents | 67098a669a4c |
| children | ffb9ddb9ba16 |
| files | doc/lispintro/ChangeLog doc/lispintro/emacs-lisp-intro.texi |
| diffstat | 2 files changed, 38 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/lispintro/ChangeLog Tue Jul 28 08:06:36 2009 +0000 +++ b/doc/lispintro/ChangeLog Tue Jul 28 15:08:17 2009 +0000 @@ -1,3 +1,8 @@ +2009-07-28 Chong Yidong <cyd@stupidchicken.com> + + * emacs-lisp-intro.texi (Simple Extension): Bump emacs versions in + examples. + 2009-07-10 Glenn Morris <rgm@gnu.org> * emacs-lisp-intro.texi (Top): Add missing @detailmenu entry.
--- a/doc/lispintro/emacs-lisp-intro.texi Tue Jul 28 08:06:36 2009 +0000 +++ b/doc/lispintro/emacs-lisp-intro.texi Tue Jul 28 15:08:17 2009 +0000 @@ -17921,18 +17921,18 @@ @cindex Conditional 'twixt two versions of Emacs @cindex Version of Emacs, choosing @cindex Emacs version, choosing -If you run two versions of GNU Emacs, such as versions 21 and 22, and +If you run two versions of GNU Emacs, such as versions 22 and 23, and use one @file{.emacs} file, you can select which code to evaluate with the following conditional: @smallexample @group (cond - (= 21 emacs-major-version) - ;; evaluate version 21 code + ((= 22 emacs-major-version) + ;; evaluate version 22 code ( @dots{} )) - (= 22 emacs-major-version) - ;; evaluate version 22 code + ((= 23 emacs-major-version) + ;; evaluate version 23 code ( @dots{} ))) @end group @end smallexample @@ -17954,52 +17954,36 @@ @smallexample @group -(when (or (= 21 emacs-major-version) - (= 22 emacs-major-version)) - (blink-cursor-mode 0) - ;; Insert newline when you press `C-n' (next-line) - ;; at the end of the buffer - (setq next-line-add-newlines t) -@end group -@group - ;; Turn on image viewing - (auto-image-file-mode t) -@end group -@group - ;; Turn on menu bar (this bar has text) - ;; (Use numeric argument to turn on) - (menu-bar-mode 1) -@end group -@group - ;; Turn off tool bar (this bar has icons) - ;; (Use numeric argument to turn on) - (tool-bar-mode nil) -@end group -@group - ;; Turn off tooltip mode for tool bar - ;; (This mode causes icon explanations to pop up) - ;; (Use numeric argument to turn on) - (tooltip-mode nil) - ;; If tooltips turned on, make tips appear promptly - (setq tooltip-delay 0.1) ; default is 0.7 second - ) -@end group -@end smallexample - -@need 1250 -Alternatively, since @code{blink-cursor-mode} has existed since Emacs -version 21 and is likely to continue, you could write - -@smallexample -@group (when (>= emacs-major-version 21) (blink-cursor-mode 0) -@end group -@end smallexample - -@noindent -and add other expressions, too. - + ;; Insert newline when you press `C-n' (next-line) + ;; at the end of the buffer + (setq next-line-add-newlines t) +@end group +@group + ;; Turn on image viewing + (auto-image-file-mode t) +@end group +@group + ;; Turn on menu bar (this bar has text) + ;; (Use numeric argument to turn on) + (menu-bar-mode 1) +@end group +@group + ;; Turn off tool bar (this bar has icons) + ;; (Use numeric argument to turn on) + (tool-bar-mode nil) +@end group +@group + ;; Turn off tooltip mode for tool bar + ;; (This mode causes icon explanations to pop up) + ;; (Use numeric argument to turn on) + (tooltip-mode nil) + ;; If tooltips turned on, make tips appear promptly + (setq tooltip-delay 0.1) ; default is 0.7 second + ) +@end group +@end smallexample @node X11 Colors, Miscellaneous, Simple Extension, Emacs Initialization @section X11 Colors