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/fringe.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/fringe.c')
| -rw-r--r-- | src/fringe.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/fringe.c b/src/fringe.c index 3c0e883b2e9..c7262d19336 100644 --- a/src/fringe.c +++ b/src/fringe.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Fringe handling (split from xdisp.c). | 1 | /* Fringe handling (split from xdisp.c). |
| 2 | Copyright (C) 1985-1988, 1993-1995, 1997-2014 Free Software | 2 | Copyright (C) 1985-1988, 1993-1995, 1997-2015 Free Software |
| 3 | Foundation, Inc. | 3 | Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| @@ -65,10 +65,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 65 | must specify physical bitmap symbols. | 65 | must specify physical bitmap symbols. |
| 66 | */ | 66 | */ |
| 67 | 67 | ||
| 68 | static Lisp_Object Qtruncation, Qcontinuation, Qoverlay_arrow; | ||
| 69 | static Lisp_Object Qempty_line, Qtop_bottom; | ||
| 70 | static Lisp_Object Qhollow_small; | ||
| 71 | |||
| 72 | enum fringe_bitmap_align | 68 | enum fringe_bitmap_align |
| 73 | { | 69 | { |
| 74 | ALIGN_BITMAP_CENTER = 0, | 70 | ALIGN_BITMAP_CENTER = 0, |