aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2007-03-18 00:20:22 +0000
committerJuanma Barranquero2007-03-18 00:20:22 +0000
commitadbb3b05470f385acd368cd0817c5c0c9f98e093 (patch)
tree3086e4f444cdf0b7f66e311e1b5c29253658116c /src
parentc4c52bb78af68b4c40685f912113f0bd730f0848 (diff)
downloademacs-adbb3b05470f385acd368cd0817c5c0c9f98e093.tar.gz
emacs-adbb3b05470f385acd368cd0817c5c0c9f98e093.zip
(syms_of_buffer) <buffer-display-table>: Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog14
-rw-r--r--src/buffer.c4
2 files changed, 7 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 24450c24149..8b7c6198e2d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,7 @@
12007-03-17 Richard Stallman <rms@gnu.org> 12007-03-17 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * dired.c (file_name_completion): Gcpro NAME. 3 * buffer.c (syms_of_buffer) <buffer-display-table>: Doc fix.
4 4 Reported by Nikolaj Schumacher <n_schumacher@web.de>.
52007-03-17 Chong Yidong <cyd@stupidchicken.com>
6
7 * xdisp.c (try_window_id): Increment matrix positions if the
8 buffer's byte count has increased, but not the character count.
9 5
102007-03-12 Andreas Schwab <schwab@suse.de> 62007-03-12 Andreas Schwab <schwab@suse.de>
11 7
@@ -35,8 +31,8 @@
35 31
362007-03-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 322007-03-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
37 33
38 * macterm.c [USE_CARBON_EVENTS] (mac_handle_mouse_event): Ignore 34 * macterm.c [USE_CARBON_EVENTS] (mac_handle_mouse_event):
39 mouse wheel movement on title bar or tool bar. 35 Ignore mouse wheel movement on title bar or tool bar.
40 36
412007-03-10 Chong Yidong <cyd@stupidchicken.com> 372007-03-10 Chong Yidong <cyd@stupidchicken.com>
42 38
diff --git a/src/buffer.c b/src/buffer.c
index b09d6e88f0b..c0fb8b2454f 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5682,8 +5682,8 @@ characters or nil. The value nil means display the character in the
5682default fashion; otherwise, the characters from the vector are delivered 5682default fashion; otherwise, the characters from the vector are delivered
5683to the screen instead of the original character. 5683to the screen instead of the original character.
5684 5684
5685For example, (aset buffer-display-table ?X ?Y) will cause Emacs to display 5685For example, (aset buffer-display-table ?X (vector ?Y)) will cause Emacs
5686a capital Y instead of each X character. 5686to display a capital Y instead of each X character.
5687 5687
5688In addition, a char-table has six extra slots to control the display of: 5688In addition, a char-table has six extra slots to control the display of:
5689 5689