[Emacs-diffs] emacs/doc/lispintro ChangeLog emacs-lisp-intro....

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/07/28 15:08:17

Modified files:
        doc/lispintro  : ChangeLog emacs-lisp-intro.texi 

Log message:
        * emacs-lisp-intro.texi (Simple Extension): Bump emacs versions in
        examples.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispintro/ChangeLog?cvsroot=emacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispintro/emacs-lisp-intro.texi?cvsroot=emacs&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/lispintro/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- ChangeLog   10 Jul 2009 04:49:24 -0000      1.27
+++ ChangeLog   28 Jul 2009 15:08:17 -0000      1.28
@@ -1,3 +1,8 @@
+2009-07-28  Chong Yidong  <address@hidden>
+
+       * emacs-lisp-intro.texi (Simple Extension): Bump emacs versions in
+       examples.
+
 2009-07-10  Glenn Morris  <address@hidden>
 
        * emacs-lisp-intro.texi (Top): Add missing @detailmenu entry.

Index: emacs-lisp-intro.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/lispintro/emacs-lisp-intro.texi,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- emacs-lisp-intro.texi       10 Jul 2009 04:49:24 -0000      1.17
+++ emacs-lisp-intro.texi       28 Jul 2009 15:08:17 -0000      1.18
@@ -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
-  ( @dots{} ))
- (= 22 emacs-major-version)
+ ((= 22 emacs-major-version)
   ;; evaluate version 22 code
+  ( @dots{} ))
+ ((= 23 emacs-major-version)
+  ;; evaluate version 23 code
   ( @dots{} )))
 @end group
 @end smallexample
@@ -17954,8 +17954,7 @@
 
 @smallexample
 @group
-(when (or (= 21 emacs-major-version)
-          (= 22 emacs-major-version))
+(when (>= emacs-major-version 21)
       (blink-cursor-mode 0)
       ;; Insert newline when you press `C-n' (next-line)
       ;; at the end of the buffer
@@ -17986,21 +17985,6 @@
 @end group
 @end smallexample
 
address@hidden 1250
-Alternatively, since @code{blink-cursor-mode} has existed since Emacs
-version 21 and is likely to continue, you could write
-
address@hidden
address@hidden
-(when (>= emacs-major-version 21)
-  (blink-cursor-mode 0)
address@hidden group
address@hidden smallexample
-
address@hidden
-and add other expressions, too.
-
-
 @node X11 Colors, Miscellaneous, Simple Extension, Emacs Initialization
 @section X11 Colors