diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/undo.c | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/undo.c')
| -rw-r--r-- | src/undo.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/undo.c b/src/undo.c index 2dde02b99a9..948dcf9ec1a 100644 --- a/src/undo.c +++ b/src/undo.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* undo handling for GNU Emacs. | 1 | /* undo handling for GNU Emacs. |
| 2 | Copyright (C) 1990, 1993-1994, 2000-2014 Free Software Foundation, | 2 | Copyright (C) 1990, 1993-1994, 2000-2015 Free Software Foundation, |
| 3 | Inc. | 3 | Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| @@ -34,12 +34,6 @@ static struct buffer *last_undo_buffer; | |||
| 34 | static struct buffer *last_boundary_buffer; | 34 | static struct buffer *last_boundary_buffer; |
| 35 | static ptrdiff_t last_boundary_position; | 35 | static ptrdiff_t last_boundary_position; |
| 36 | 36 | ||
| 37 | Lisp_Object Qinhibit_read_only; | ||
| 38 | |||
| 39 | /* Marker for function call undo list elements. */ | ||
| 40 | |||
| 41 | Lisp_Object Qapply; | ||
| 42 | |||
| 43 | /* The first time a command records something for undo. | 37 | /* The first time a command records something for undo. |
| 44 | it also allocates the undo-boundary object | 38 | it also allocates the undo-boundary object |
| 45 | which will be added to the list at the end of the command. | 39 | which will be added to the list at the end of the command. |
| @@ -461,6 +455,8 @@ void | |||
| 461 | syms_of_undo (void) | 455 | syms_of_undo (void) |
| 462 | { | 456 | { |
| 463 | DEFSYM (Qinhibit_read_only, "inhibit-read-only"); | 457 | DEFSYM (Qinhibit_read_only, "inhibit-read-only"); |
| 458 | |||
| 459 | /* Marker for function call undo list elements. */ | ||
| 464 | DEFSYM (Qapply, "apply"); | 460 | DEFSYM (Qapply, "apply"); |
| 465 | 461 | ||
| 466 | pending_boundary = Qnil; | 462 | pending_boundary = Qnil; |