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/buffer.h | |
| 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/buffer.h')
| -rw-r--r-- | src/buffer.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/buffer.h b/src/buffer.h index 284cfa7b4a8..81852cae505 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Header file for the buffer manipulation primitives. | 1 | /* Header file for the buffer manipulation primitives. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1986, 1993-1995, 1997-2014 Free Software Foundation, | 3 | Copyright (C) 1985-1986, 1993-1995, 1997-2015 Free Software Foundation, |
| 4 | Inc. | 4 | Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| @@ -1141,12 +1141,6 @@ record_unwind_current_buffer (void) | |||
| 1141 | } while (false) | 1141 | } while (false) |
| 1142 | 1142 | ||
| 1143 | extern Lisp_Object Vbuffer_alist; | 1143 | extern Lisp_Object Vbuffer_alist; |
| 1144 | extern Lisp_Object Qbefore_change_functions; | ||
| 1145 | extern Lisp_Object Qafter_change_functions; | ||
| 1146 | extern Lisp_Object Qfirst_change_hook; | ||
| 1147 | extern Lisp_Object Qpriority, Qbefore_string, Qafter_string; | ||
| 1148 | extern Lisp_Object Qchoice, Qrange, Qleft, Qright; | ||
| 1149 | extern Lisp_Object Qvertical_scroll_bar, Qhorizontal_scroll_bar; | ||
| 1150 | 1144 | ||
| 1151 | /* FOR_EACH_LIVE_BUFFER (LIST_VAR, BUF_VAR) followed by a statement is | 1145 | /* FOR_EACH_LIVE_BUFFER (LIST_VAR, BUF_VAR) followed by a statement is |
| 1152 | a `for' loop which iterates over the buffers from Vbuffer_alist. */ | 1146 | a `for' loop which iterates over the buffers from Vbuffer_alist. */ |