aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-11-20 14:52:20 -0500
committerChong Yidong2010-11-20 14:52:20 -0500
commitec8a6295a0e4554f2ce8164ff3fe5e2910810d0d (patch)
tree59d16ae6eef3b8a7cdb3e7df405c83961c09373c
parent8d7f026f625a02854b3214f7a54e778121d266bc (diff)
downloademacs-ec8a6295a0e4554f2ce8164ff3fe5e2910810d0d.tar.gz
emacs-ec8a6295a0e4554f2ce8164ff3fe5e2910810d0d.zip
Document some Emacs 23.3 changes in manuals.
* doc/emacs/macos.texi (Mac / GNUstep Basics): Document ns-right-alternate-modifier. * doc/lispref/numbers.texi (Float Basics): Document float-e and float-pi. * doc/lispref/symbols.texi (Creating Symbols): Using unintern without an obarray arg is now obsolete. * doc/lispref/text.texi (Kill Functions, Kill Functions) (Low-Level Kill Ring, Low-Level Kill Ring): Remove obsolete YANK-HANDLER args. * doc/lispref/variables.texi (Defining Variables): Change "pi" example to "float-pi".
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/macos.texi89
-rw-r--r--doc/lispref/ChangeLog14
-rw-r--r--doc/lispref/numbers.texi8
-rw-r--r--doc/lispref/symbols.texi2
-rw-r--r--doc/lispref/text.texi25
-rw-r--r--doc/lispref/variables.texi18
-rw-r--r--etc/NEWS23
8 files changed, 97 insertions, 87 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 18819f858fd..c2752dd3a47 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12010-11-20 Chong Yidong <cyd@stupidchicken.com>
2
3 * macos.texi (Mac / GNUstep Basics): Document
4 ns-right-alternate-modifier.
5
12010-11-06 Eli Zaretskii <eliz@gnu.org> 62010-11-06 Eli Zaretskii <eliz@gnu.org>
2 7
3 * msdog.texi (Windows HOME): Add information regarding startup 8 * msdog.texi (Windows HOME): Add information regarding startup
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 6fa5666ba6f..044a722a07a 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -8,23 +8,22 @@
8@cindex Macintosh 8@cindex Macintosh
9@cindex GNUstep 9@cindex GNUstep
10 10
11 This section briefly describes the peculiarities of using Emacs built with 11 This section describes the peculiarities of using Emacs built with
12the GNUstep libraries on GNU/Linux or other operating systems, or on Mac OS X 12the GNUstep libraries on GNU/Linux or other operating systems, or on
13with native window system support. For Mac OS X, Emacs can be built either 13Mac OS X with native window system support. On Mac OS X, Emacs can be
14without window system support, with X11, or with the Cocoa interface. This 14built either without window system support, with X11, or with the
15section only applies to the Cocoa build. Emacs 23 does not support Mac OS 15Cocoa interface; this section only applies to the Cocoa build. Emacs
16Classic. 16does not support earlier versions of Mac OS.
17 17
18 Emacs, when built on Mac OS X, uses the Cocoa application interface. For 18 For various historical and technical reasons, Emacs uses the term
19various historical and technical reasons, Emacs uses the term @samp{Nextstep} 19@samp{Nextstep} internally, instead of ``Cocoa'' or ``Mac OS X''; for
20internally, instead of ``Cocoa'' or ``Mac OS X''; for instance, most of the 20instance, most of the commands and variables described in this section
21commands and variables described in the following sections begin with 21begin with @samp{ns-}, which is short for @samp{Nextstep}. NeXTstep
22@samp{ns-}, which is short for @samp{Nextstep}. NeXTstep was an application 22was an application interface released by NeXT Inc during the 1980s, of
23interface released by NeXT Inc during the 1980s, of which Cocoa is a direct 23which Cocoa is a direct descendant. Apart from Cocoa, there is
24descendant. Apart from Cocoa, there is another NeXTstep-style system: 24another NeXTstep-style system: GNUstep, which is free software. As of
25GNUstep, which is free software. As of this writing, the GNUstep support is 25this writing, the GNUstep support is alpha status (@pxref{GNUstep
26alpha status (@pxref{GNUstep Support}), but we hope to improve it in the 26Support}), but we hope to improve it in the future.
27future.
28 27
29@menu 28@menu
30* Mac / GNUstep Basics:: Basic Emacs usage under GNUstep or Mac OS. 29* Mac / GNUstep Basics:: Basic Emacs usage under GNUstep or Mac OS.
@@ -37,19 +36,24 @@ future.
37@section Basic Emacs usage under Mac OS and GNUstep 36@section Basic Emacs usage under Mac OS and GNUstep
38 37
39 By default, the @key{alt} and @key{option} keys are the same as 38 By default, the @key{alt} and @key{option} keys are the same as
40@key{Meta} when running under Mac OS. The Mac @key{Cmd} key is the 39@key{Meta}. The Mac @key{Cmd} key is the same as @key{Super}, and
41same as @key{Super}, and Emacs provides a set of keybindings using 40Emacs provides a set of keybindings using this modifier key that mimic
42this modifier key that mimic other Mac / GNUstep applications (@pxref{Mac / 41other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}). You
43GNUstep Events}). You can change these bindings in the usual way (@pxref{Key 42can change these bindings in the usual way (@pxref{Key Bindings}).
44Bindings}). 43
45 44 The variable @code{ns-right-alternate-modifier} controls the
46 The standard Mac / GNUstep font and color panels are accessible via Lisp commands. 45behavior of the right @key{alt} and @key{option} keys. These keys
47 To use the color panel, drag from it to an Emacs frame to change the 46behave like the left-hand keys if the value is @code{left} (the
48foreground color of the face at that position (if the @key{shift} key 47default). A value of @code{control}, @code{meta}, @code{alt},
49is held down, it changes the background color instead). To discard the 48@code{super}, or @code{hyper} makes them behave like the corresponding
50settings, create a new frame and close the altered one. 49modifier keys; a value of @code{none} tells Emacs to ignore them.
51@c [unclear if the following holds.] 50
52@c To finalize the settings for either color or font, choose @samp{Save Options} in the @samp{Options} menu. 51 The standard Mac / GNUstep font and color panels are accessible via
52Lisp commands. To use the color panel, drag from it to an Emacs frame
53to change the foreground color of the face at that position (if the
54@key{shift} key is held down, it changes the background color
55instead). To discard the settings, create a new frame and close the
56altered one.
53 57
54 @key{S-Mouse-1} (i.e., clicking the left mouse button 58 @key{S-Mouse-1} (i.e., clicking the left mouse button
55while holding down the @key{Shift} key) adjusts the region to the 59while holding down the @key{Shift} key) adjusts the region to the
@@ -58,7 +62,7 @@ it does not pop up a menu for changing the default face, as
58@key{S-Mouse-1} normally does (@pxref{Temporary Face Changes}). This 62@key{S-Mouse-1} normally does (@pxref{Temporary Face Changes}). This
59change makes Emacs behave more like other Mac / GNUstep applications. 63change makes Emacs behave more like other Mac / GNUstep applications.
60 64
61 When you open or save files using the menus, or using the 65 When you open or save files using the menus, or using the
62@key{Cmd-o} and @key{Cmd-S} bindings, Emacs uses graphical file 66@key{Cmd-o} and @key{Cmd-S} bindings, Emacs uses graphical file
63dialogs to read file names. However, if you use the regular Emacs key 67dialogs to read file names. However, if you use the regular Emacs key
64sequences, such as @key{C-x C-f}, Emacs uses the minibuffer to read 68sequences, such as @key{C-x C-f}, Emacs uses the minibuffer to read
@@ -110,7 +114,7 @@ dragging will alter the foreground color. Shift dragging will alter the
110background color. 114background color.
111 115
112@c To make the changes permanent select the "Save Options" 116@c To make the changes permanent select the "Save Options"
113@c item in the "Options" menu, or run @code{menu-bar-options-save}. 117@c item in the "Options" menu, or run @code{menu-bar-options-save}.
114 118
115Useful in this context is the listing of all faces obtained by @key{M-x} 119Useful in this context is the listing of all faces obtained by @key{M-x}
116@code{list-faces-display}. 120@code{list-faces-display}.
@@ -193,7 +197,7 @@ font are stored in the variables @code{ns-input-font} and
193@code{ns-input-fontsize}, respectively. 197@code{ns-input-fontsize}, respectively.
194 198
195@item ns-power-off 199@item ns-power-off
196This event occurs when the user logs out and Emacs is still running, or when 200This event occurs when the user logs out and Emacs is still running, or when
197`Quit Emacs' is chosen from the application menu. 201`Quit Emacs' is chosen from the application menu.
198The default behavior is to save all file-visiting buffers. 202The default behavior is to save all file-visiting buffers.
199@end table 203@end table
@@ -208,26 +212,9 @@ and return the result as a string. You can also use the Lisp function
208services and receive the results back. Note that you may need to 212services and receive the results back. Note that you may need to
209restart Emacs to access newly-available services. 213restart Emacs to access newly-available services.
210 214
211
212@node GNUstep Support, , Mac / GNUstep Events, Mac OS / GNUstep 215@node GNUstep Support, , Mac / GNUstep Events, Mac OS / GNUstep
213@section GNUstep Support 216@section GNUstep Support
214 217
215Emacs can be built and run under GNUstep, however there are still some 218Emacs can be built and run under GNUstep, but there are still some
216issues to be addressed. Interested developers should contact 219issues to be addressed. Interested developers should contact
217@email{emacs-devel@@gnu.org}. 220@email{emacs-devel@@gnu.org}.
218
219@c Presumably no longer relevant since CANNOT_DUMP removed 2009-05-06:
220@ignore
221In particular, it may be necessary to run @samp{make bootstrap} with a
222plain X configuration, then @samp{make clean} and @samp{./configure
223--with-ns} followed by @samp{make install}.
224
225Currently CANNOT_DUMP is automatically enabled in GNUstep configurations,
226because the unex file(s) for GNUstep, mainly @samp{unexelf.c}, have not been
227updated yet with the ``zone'' code in and related to @samp{unexmacosx.c}.
228@end ignore
229
230
231@ignore
232 arch-tag: a822c2ab-4273-4997-927e-c153bb71dcf6
233@end ignore
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 79d6f71c1b4..2ea15fe3ca8 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,17 @@
12010-11-20 Chong Yidong <cyd@stupidchicken.com>
2
3 * text.texi (Kill Functions, Kill Functions)
4 (Low-Level Kill Ring, Low-Level Kill Ring): Remove obsolete
5 YANK-HANDLER args.
6
7 * symbols.texi (Creating Symbols): Using unintern without an
8 obarray arg is now obsolete.
9
10 * numbers.texi (Float Basics): Document float-e and float-pi.
11
12 * variables.texi (Defining Variables): Change "pi" example to
13 "float-pi".
14
12010-11-12 Eli Zaretskii <eliz@gnu.org> 152010-11-12 Eli Zaretskii <eliz@gnu.org>
2 16
3 * customize.texi (Composite Types): Lower-case index entry. 17 * customize.texi (Composite Types): Lower-case index entry.
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index 62b4796350e..e83da348e05 100644
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -224,6 +224,14 @@ down to an integer.
224@end example 224@end example
225@end defun 225@end defun
226 226
227@defvar float-e
228The mathematical constant @math{e} (2.71828@dots{}).
229@end defvar
230
231@defvar float-pi
232The mathematical constant @math{pi} (3.14159@dots{}).
233@end defvar
234
227@node Predicates on Numbers 235@node Predicates on Numbers
228@section Type Predicates for Numbers 236@section Type Predicates for Numbers
229@cindex predicates for numbers 237@cindex predicates for numbers
diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi
index 5bb44ff9675..ccf90e33cd0 100644
--- a/doc/lispref/symbols.texi
+++ b/doc/lispref/symbols.texi
@@ -383,7 +383,7 @@ See @code{documentation} in @ref{Accessing Documentation}, for another
383example using @code{mapatoms}. 383example using @code{mapatoms}.
384@end defun 384@end defun
385 385
386@defun unintern symbol &optional obarray 386@defun unintern symbol obarray
387This function deletes @var{symbol} from the obarray @var{obarray}. If 387This function deletes @var{symbol} from the obarray @var{obarray}. If
388@code{symbol} is not actually in the obarray, @code{unintern} does 388@code{symbol} is not actually in the obarray, @code{unintern} does
389nothing. If @var{obarray} is @code{nil}, the current obarray is used. 389nothing. If @var{obarray} is @code{nil}, the current obarray is used.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 2510607475b..025bf1b6f85 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -865,7 +865,7 @@ adds it to the most recent element. It determines automatically (using
865@code{last-command}) whether the previous command was a kill command, 865@code{last-command}) whether the previous command was a kill command,
866and if so appends the killed text to the most recent entry. 866and if so appends the killed text to the most recent entry.
867 867
868@deffn Command kill-region start end &optional yank-handler 868@deffn Command kill-region start end
869This function kills the text in the region defined by @var{start} and 869This function kills the text in the region defined by @var{start} and
870@var{end}. The text is deleted but saved in the kill ring, along with 870@var{end}. The text is deleted but saved in the kill ring, along with
871its text properties. The value is always @code{nil}. 871its text properties. The value is always @code{nil}.
@@ -873,17 +873,10 @@ its text properties. The value is always @code{nil}.
873In an interactive call, @var{start} and @var{end} are point and 873In an interactive call, @var{start} and @var{end} are point and
874the mark. 874the mark.
875 875
876@c Emacs 19 feature
877If the buffer or text is read-only, @code{kill-region} modifies the kill 876If the buffer or text is read-only, @code{kill-region} modifies the kill
878ring just the same, then signals an error without modifying the buffer. 877ring just the same, then signals an error without modifying the buffer.
879This is convenient because it lets the user use a series of kill 878This is convenient because it lets the user use a series of kill
880commands to copy text from a read-only buffer into the kill ring. 879commands to copy text from a read-only buffer into the kill ring.
881
882If @var{yank-handler} is non-@code{nil}, this puts that value onto
883the string of killed text, as a @code{yank-handler} text property.
884@xref{Yanking}. Note that if @var{yank-handler} is @code{nil}, any
885@code{yank-handler} properties present on the killed text are copied
886onto the kill ring, like other text properties.
887@end deffn 880@end deffn
888 881
889@defopt kill-read-only-ok 882@defopt kill-read-only-ok
@@ -1068,7 +1061,7 @@ it returns the entry pointed at by the yanking pointer and does not
1068move the yanking pointer. 1061move the yanking pointer.
1069@end defun 1062@end defun
1070 1063
1071@defun kill-new string &optional replace yank-handler 1064@defun kill-new string &optional replace
1072This function pushes the text @var{string} onto the kill ring and 1065This function pushes the text @var{string} onto the kill ring and
1073makes the yanking pointer point to it. It discards the oldest entry 1066makes the yanking pointer point to it. It discards the oldest entry
1074if appropriate. It also invokes the value of 1067if appropriate. It also invokes the value of
@@ -1077,25 +1070,15 @@ if appropriate. It also invokes the value of
1077If @var{replace} is non-@code{nil}, then @code{kill-new} replaces the 1070If @var{replace} is non-@code{nil}, then @code{kill-new} replaces the
1078first element of the kill ring with @var{string}, rather than pushing 1071first element of the kill ring with @var{string}, rather than pushing
1079@var{string} onto the kill ring. 1072@var{string} onto the kill ring.
1080
1081If @var{yank-handler} is non-@code{nil}, this puts that value onto
1082the string of killed text, as a @code{yank-handler} property.
1083@xref{Yanking}. Note that if @var{yank-handler} is @code{nil}, then
1084@code{kill-new} copies any @code{yank-handler} properties present on
1085@var{string} onto the kill ring, as it does with other text properties.
1086@end defun 1073@end defun
1087 1074
1088@defun kill-append string before-p &optional yank-handler 1075@defun kill-append string before-p
1089This function appends the text @var{string} to the first entry in the 1076This function appends the text @var{string} to the first entry in the
1090kill ring and makes the yanking pointer point to the combined entry. 1077kill ring and makes the yanking pointer point to the combined entry.
1091Normally @var{string} goes at the end of the entry, but if 1078Normally @var{string} goes at the end of the entry, but if
1092@var{before-p} is non-@code{nil}, it goes at the beginning. This 1079@var{before-p} is non-@code{nil}, it goes at the beginning. This
1093function also invokes the value of @code{interprogram-cut-function} 1080function also invokes the value of @code{interprogram-cut-function}
1094(see below). This handles @var{yank-handler} just like 1081(see below).
1095@code{kill-new}, except that if @var{yank-handler} is different from
1096the @code{yank-handler} property of the first entry of the kill ring,
1097@code{kill-append} pushes the concatenated string onto the kill ring,
1098instead of replacing the original first entry with it.
1099@end defun 1082@end defun
1100 1083
1101@defvar interprogram-paste-function 1084@defvar interprogram-paste-function
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index a3a550868f5..20fe4dbc9fa 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -544,21 +544,23 @@ not the buffer-local value. (But you should not be making
544buffer-local bindings for a symbol that is defined with 544buffer-local bindings for a symbol that is defined with
545@code{defconst}.) 545@code{defconst}.)
546 546
547Here, @code{pi} is a constant that presumably ought not to be changed 547An example of the use of @code{defconst} is Emacs' definition of
548by anyone (attempts by the Indiana State Legislature notwithstanding). 548@code{float-pi}---the mathematical constant @math{pi}, which ought not
549As the second form illustrates, however, this is only advisory. 549to be changed by anyone (attempts by the Indiana State Legislature
550notwithstanding). As the second form illustrates, however,
551@code{defconst} is only advisory.
550 552
551@example 553@example
552@group 554@group
553(defconst pi 3.1415 "Pi to five places.") 555(defconst float-pi 3.141592653589793 "The value of Pi.")
554 @result{} pi 556 @result{} float-pi
555@end group 557@end group
556@group 558@group
557(setq pi 3) 559(setq float-pi 3)
558 @result{} pi 560 @result{} float-pi
559@end group 561@end group
560@group 562@group
561pi 563float-pi
562 @result{} 3 564 @result{} 3
563@end group 565@end group
564@end example 566@end example
diff --git a/etc/NEWS b/etc/NEWS
index eb765f37373..59b63440775 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -26,9 +26,6 @@ used on x86-64 and s390x GNU/Linux architectures.
26 26
27* Changes in Emacs 23.3 27* Changes in Emacs 23.3
28 28
29** The nextstep port can have different modifiers for the left and right
30alt/option key by customizing the value for ns-right-alternate-modifier.
31
32 29
33* Editing Changes in Emacs 23.3 30* Editing Changes in Emacs 23.3
34 31
@@ -82,10 +79,12 @@ produce an up to date diff.
82 79
83 80
84* New Modes and Packages in Emacs 23.3 81* New Modes and Packages in Emacs 23.3
82
85** smie.el is a generic navigation and indentation engine. 83** smie.el is a generic navigation and indentation engine.
86It takes a simple BNF description of the grammar, and provides both 84It takes a simple BNF description of the grammar, and provides both
87sexp-style navigation (jumping over begin..end pairs) as well as 85sexp-style navigation (jumping over begin..end pairs) as well as
88indentation, which can be adjusted via ad-hoc indentation rules. 86indentation, which can be adjusted via ad-hoc indentation rules.
87
89 88
90* Incompatible Lisp Changes in Emacs 23.3 89* Incompatible Lisp Changes in Emacs 23.3
91 90
@@ -96,16 +95,28 @@ starting from the first line of text below the header line.
96 95
97* Lisp changes in Emacs 23.3 96* Lisp changes in Emacs 23.3
98 97
98+++
99** `e' and `pi' are now called `float-e' and `float-pi'. 99** `e' and `pi' are now called `float-e' and `float-pi'.
100 The old names are obsolete. 100 The old names are obsolete.
101** The use of unintern without an obarray arg is declared obsolete. 101
102** The function `princ-list' is declared obsolete. 102+++
103** The yank-handler argument to kill-region and friends is declared obsolete. 103** The use of unintern without an obarray arg is now obsolete.
104
105---
106** The function `princ-list' is now obsolete.
107
108+++
109** The yank-handler argument to kill-region and friends is now obsolete.
110
104** New function byte-to-string, like char-to-string but for bytes. 111** New function byte-to-string, like char-to-string but for bytes.
105 112
106 113
107* Changes in Emacs 23.3 on non-free operating systems 114* Changes in Emacs 23.3 on non-free operating systems
108 115
116+++
117** The nextstep port can have different modifiers for the left and right
118alt/option key by customizing the value for ns-right-alternate-modifier.
119
109 120
110* Installation Changes in Emacs 23.2 121* Installation Changes in Emacs 23.2
111 122