aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2007-06-27 11:40:26 +0000
committerJuanma Barranquero2007-06-27 11:40:26 +0000
commit251db0f475e5a9af9861be3b983bafbdf9afd403 (patch)
treeaa54cade9a6832d1934e05513d40de9c35d77833 /src
parent56f3136b14426dc58245c3f853740b3b6f68f9be (diff)
downloademacs-251db0f475e5a9af9861be3b983bafbdf9afd403.tar.gz
emacs-251db0f475e5a9af9861be3b983bafbdf9afd403.zip
(syms_of_buffer) <selective-display>: Fix typo in docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog10
-rw-r--r--src/buffer.c4
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7d9b3a7790a..c87474ba4ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12007-06-27 Juanma Barranquero <lekktu@gmail.com>
2
3 * buffer.c (syms_of_buffer) <selective-display>: Fix typo in docstring.
4
12007-06-26 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 52007-06-26 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 6
3 * gmalloc.c [HAVE_GTK_AND_PTHREAD]: Check this after including config.h. 7 * gmalloc.c [HAVE_GTK_AND_PTHREAD]: Check this after including config.h.
@@ -10210,7 +10214,7 @@
10210 (XTread_socket) [!MAC_OSX]: Don't pass keyboard events to TSM. 10214 (XTread_socket) [!MAC_OSX]: Don't pass keyboard events to TSM.
10211 [MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]: 10215 [MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]:
10212 Set default cursors. 10216 Set default cursors.
10213 (mac_initialize) [USE_CARBON_EVENTS && !MAC_OSX] : Don't call 10217 (mac_initialize) [USE_CARBON_EVENTS && !MAC_OSX]: Don't call
10214 init_service_handler or init_quit_char_handler. 10218 init_service_handler or init_quit_char_handler.
10215 (mac_initialize) [!MAC_OSX]: Don't call MakeMeTheFrontProcess. 10219 (mac_initialize) [!MAC_OSX]: Don't call MakeMeTheFrontProcess.
10216 10220
@@ -11147,7 +11151,7 @@
11147 (install_window_handler) [TARGET_API_MAC_CARBON]: 11151 (install_window_handler) [TARGET_API_MAC_CARBON]:
11148 Register handlers for tracking/receiving drag-and-drop items. 11152 Register handlers for tracking/receiving drag-and-drop items.
11149 (do_ae_open_documents): Generate unibyte strings for filenames. 11153 (do_ae_open_documents): Generate unibyte strings for filenames.
11150 (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise. 11154 (mac_do_receive_drag) [TARGET_API_MAC_CARBON]: Likewise.
11151 Reject only non-filename items. Set event modifiers, and return value. 11155 Reject only non-filename items. Set event modifiers, and return value.
11152 11156
111532004-12-28 Dan Nicolaescu <dann@ics.uci.edu> 111572004-12-28 Dan Nicolaescu <dann@ics.uci.edu>
@@ -15537,7 +15541,7 @@
15537 15541
15538 * macgui.h [MAC_OSX]: Include Carbon/Carbon.h. 15542 * macgui.h [MAC_OSX]: Include Carbon/Carbon.h.
15539 (mktime, DEBUG, Z, free, malloc, realloc, max, min) 15543 (mktime, DEBUG, Z, free, malloc, realloc, max, min)
15540 (init_process) [MAC_OSX] : Avoid conflicts with Carbon/Carbon.h. 15544 (init_process) [MAC_OSX]: Avoid conflicts with Carbon/Carbon.h.
15541 [!MAC_OSX]: Include QDOffscreen.h and Controls.h. 15545 [!MAC_OSX]: Include QDOffscreen.h and Controls.h.
15542 (INFINITY) [MAC_OSX]: Avoid conflict with definition in math.h. 15546 (INFINITY) [MAC_OSX]: Avoid conflict with definition in math.h.
15543 (Bitmap): Remove typedef. 15547 (Bitmap): Remove typedef.
diff --git a/src/buffer.c b/src/buffer.c
index 94955ed7c24..368da4763a5 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5652,8 +5652,8 @@ Backing up is done before the first time the file is saved. */);
5652 DEFVAR_PER_BUFFER ("selective-display", &current_buffer->selective_display, 5652 DEFVAR_PER_BUFFER ("selective-display", &current_buffer->selective_display,
5653 Qnil, 5653 Qnil,
5654 doc: /* Non-nil enables selective display. 5654 doc: /* Non-nil enables selective display.
5655An Integer N as value means display only lines 5655An integer N as value means display only lines
5656that start with less than n columns of space. 5656that start with less than N columns of space.
5657A value of t means that the character ^M makes itself and 5657A value of t means that the character ^M makes itself and
5658all the rest of the line invisible; also, when saving the buffer 5658all the rest of the line invisible; also, when saving the buffer
5659in a file, save the ^M as a newline. */); 5659in a file, save the ^M as a newline. */);