diff options
| author | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-04 10:59:08 +0800 |
|---|---|---|
| committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-04 10:59:08 +0800 |
| commit | 99191b89ff64172740add88e67f163619a07830c (patch) | |
| tree | 828d1ac7c917076703b9d4a3746ff7480bd97f0d /doc/lispintro | |
| parent | ab419665caa6e2ad7465cf59ef902cc4ad1d2117 (diff) | |
| parent | 2ad0a067728ccc7f8b32b0c3db1677ca351943fe (diff) | |
| download | emacs-99191b89ff64172740add88e67f163619a07830c.tar.gz | |
Merge from mainline.
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 4182b6a3184..481eb0c9db8 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2013-08-02 Xue Fuqiao <xfq.free@gmail.com> + + * emacs-lisp-intro.texi (zap-to-char): Remove obsolete stuff. + 2013-07-06 Glenn Morris <rgm@gnu.org> * emacs-lisp-intro.texi (Top): diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index dafee51a020..f0d9ab63935 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -7537,20 +7537,7 @@ retrieved. @xref{Yanking, , Yanking Text Back}. @section @code{zap-to-char} @findex zap-to-char -@c FIXME remove obsolete stuff -The @code{zap-to-char} function changed little between GNU Emacs -version 19 and GNU Emacs version 22. However, @code{zap-to-char} -calls another function, @code{kill-region}, which enjoyed a major -rewrite. - -The @code{kill-region} function in Emacs 19 is complex, but does not -use code that is important at this time. We will skip it. - -The @code{kill-region} function in Emacs 22 is easier to read than the -same function in Emacs 19 and introduces a very important concept, -that of error handling. We will walk through the function. - -But first, let us look at the interactive @code{zap-to-char} function. +Let us look at the interactive @code{zap-to-char} function. @menu * Complete zap-to-char:: The complete implementation. |