diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/scroll.c | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/scroll.c')
| -rw-r--r-- | src/scroll.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/scroll.c b/src/scroll.c index b91c7de034e..296e5784d0c 100644 --- a/src/scroll.c +++ b/src/scroll.c | |||
| @@ -1035,5 +1035,3 @@ do_line_insertion_deletion_costs (FRAME_PTR frame, | |||
| 1035 | coefficient); | 1035 | coefficient); |
| 1036 | } | 1036 | } |
| 1037 | 1037 | ||
| 1038 | /* arch-tag: cdb7149c-48e7-4793-a948-2786c8e45485 | ||
| 1039 | (do not change this comment) */ | ||