[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104429: Merge from emacs-23; up to r
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104429: Merge from emacs-23; up to r100589. |
|
Date: |
Sun, 29 May 2011 15:41:06 -0700 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104429 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2011-05-29 15:41:06 -0700
message:
Merge from emacs-23; up to r100589.
modified:
doc/lispref/ChangeLog
doc/lispref/compile.texi
doc/lispref/display.texi
doc/lispref/elisp.texi
doc/lispref/help.texi
doc/lispref/keymaps.texi
doc/lispref/lists.texi
doc/lispref/minibuf.texi
doc/lispref/modes.texi
doc/lispref/nonascii.texi
doc/lispref/processes.texi
doc/lispref/strings.texi
doc/lispref/text.texi
doc/lispref/tips.texi
doc/lispref/windows.texi
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2011-05-29 19:00:00 +0000
+++ b/doc/lispref/ChangeLog 2011-05-29 22:41:06 +0000
@@ -1,5 +1,22 @@
2011-05-29 Chong Yidong <address@hidden>
+ * help.texi (Accessing Documentation):
+ * display.texi (Pixel Specification):
+ * processes.texi (Serial Ports, Serial Ports):
+ * nonascii.texi (Character Properties, Default Coding Systems):
+ * text.texi (Changing Properties, Special Properties):
+ * windows.texi (Window Start and End):
+ * modes.texi (SMIE Indentation Example, SMIE Tricks):
+ * keymaps.texi (Searching Keymaps, Tool Bar):
+ * minibuf.texi (Basic Completion):
+ * compile.texi (Eval During Compile):
+ * strings.texi (Formatting Strings): Tweaks to avoid overflowing
+ 7x9 paper in printed manual.
+
+ * lists.texi (Sets And Lists): Fix misplaced text.
+
+2011-05-29 Chong Yidong <address@hidden>
+
* keymaps.texi (Remapping Commands): Emphasize that the keymap
needs to be active (Bug#8350).
=== modified file 'doc/lispref/compile.texi'
--- a/doc/lispref/compile.texi 2011-01-25 04:08:28 +0000
+++ b/doc/lispref/compile.texi 2011-05-29 22:41:06 +0000
@@ -445,7 +445,7 @@
@lisp
(eval-when-compile
- (require 'my-macro-package)) ;; only macros needed from this
+ (require 'my-macro-package))
@end lisp
The same sort of thing goes for macros and @code{defsubst} functions
=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi 2011-05-19 06:54:27 +0000
+++ b/doc/lispref/display.texi 2011-05-29 22:41:06 +0000
@@ -1441,9 +1441,9 @@
Attributes}.
@item
-A cons cell, either of the form @code{(foreground-color . @var{color-name})} or
address@hidden(background-color . @var{color-name})}. These elements specify
-just the foreground color or just the background color.
+A cons cell, either of the form @code{(fg-color . @var{color-name})}
+or @code{(bg-color . @var{color-name})}. These elements specify just
+the foreground color or just the background color.
@code{(foreground-color . @var{color-name})} has the same effect as
@code{(:foreground @var{color-name})}; likewise for the background.
@@ -3821,9 +3821,10 @@
and height of the current face. An image specification @code{image}
corresponds to the width or height of the image.
- The @code{left-fringe}, @code{right-fringe}, @code{left-margin},
address@hidden, @code{scroll-bar}, and @code{text} elements
-specify to the width of the corresponding area of the window.
+ The elements @code{left-fringe}, @code{right-fringe},
address@hidden, @code{right-margin}, @code{scroll-bar}, and
address@hidden specify to the width of the corresponding area of the
+window.
The @code{left}, @code{center}, and @code{right} positions can be
used with @code{:align-to} to specify a position relative to the left
@@ -4652,16 +4653,14 @@
found, don't signal an error. Instead, return a list of directories as
before, except that @code{nil} appears in place of the image directory.
-Here is an example that uses a common idiom to provide compatibility
-with versions of Emacs that lack the variable @code{image-load-path}:
+Here is an example of using @code{image-load-path-for-library}:
@example
(defvar image-load-path) ; shush compiler
(let* ((load-path (image-load-path-for-library
- "mh-e" "mh-logo.xpm"))
+ "mh-e" "mh-logo.xpm"))
(image-load-path (cons (car load-path)
- (when (boundp 'image-load-path)
- image-load-path))))
+ image-load-path)))
(mh-tool-bar-folder-buttons-init))
@end example
@end defun
@@ -5399,8 +5398,10 @@
(aref colorcomp-data 2)))
(samp " (sample text) "))
(insert "Color\t: "
- (propertize samp 'face `(foreground-color . ,cstr))
- (propertize samp 'face `(background-color . ,cstr))
+ (propertize samp 'face
+ `(foreground-color . ,cstr))
+ (propertize samp 'face
+ `(background-color . ,cstr))
"\n"))))
(defun colorcomp (color)
=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi 2011-05-12 07:07:06 +0000
+++ b/doc/lispref/elisp.texi 2011-05-29 22:41:06 +0000
@@ -14,7 +14,7 @@
@c in general, keep the following line commented out, unless doing a
@c copy of this manual that will be published. The manual should go
@c onto the distribution in the full, 8.5 x 11" size.
address@hidden set smallbook
address@hidden @smallbook
@ifset smallbook
@smallbook
=== modified file 'doc/lispref/help.texi'
--- a/doc/lispref/help.texi 2011-01-25 04:08:28 +0000
+++ b/doc/lispref/help.texi 2011-05-29 22:41:06 +0000
@@ -138,9 +138,9 @@
@end defun
@defun documentation function &optional verbatim
-This function returns the documentation string of @var{function}.
address@hidden handles macros, named keyboard macros, and
-special forms, as well as ordinary functions.
+This function returns the documentation string of @var{function}. It
+handles macros, named keyboard macros, and special forms, as well as
+ordinary functions.
If @var{function} is a symbol, this function first looks for the
@code{function-documentation} property of that symbol; if that has a
=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi 2011-05-29 19:00:00 +0000
+++ b/doc/lispref/keymaps.texi 2011-05-29 22:41:06 +0000
@@ -718,17 +718,18 @@
them:
@lisp
-(or (if overriding-terminal-local-map
- (@var{find-in} overriding-terminal-local-map)
- (if overriding-local-map
- (@var{find-in} overriding-local-map)
- (or (@var{find-in} (get-char-property (point) 'keymap))
- (@var{find-in-any} emulation-mode-map-alists)
- (@var{find-in-any} minor-mode-overriding-map-alist)
- (@var{find-in-any} minor-mode-map-alist)
- (if (get-text-property (point) 'local-map)
- (@var{find-in} (get-char-property (point) 'local-map))
- (@var{find-in} (current-local-map))))))
+(or (cond
+ (overriding-terminal-local-map
+ (@var{find-in} overriding-terminal-local-map))
+ (overriding-local-map
+ (@var{find-in} overriding-local-map))
+ (or (@var{find-in} (get-char-property (point) 'keymap))
+ (@var{find-in-any} emulation-mode-map-alists)
+ (@var{find-in-any} minor-mode-overriding-map-alist)
+ (@var{find-in-any} minor-mode-map-alist)
+ (if (get-text-property (point) 'local-map)
+ (@var{find-in} (get-char-property (point) 'local-map))
+ (@var{find-in} (current-local-map)))))
(@var{find-in} (current-global-map)))
@end lisp
@@ -2635,8 +2636,8 @@
By default, the global map binds @code{[tool-bar]} as follows:
@example
(global-set-key [tool-bar]
- '(menu-item "tool bar" ignore
- :filter (lambda (ignore) tool-bar-map)))
+ '(menu-item "tool bar" ignore
+ :filter (lambda (ignore) tool-bar-map)))
@end example
@noindent
Thus the tool bar map is derived dynamically from the value of variable
=== modified file 'doc/lispref/lists.texi'
--- a/doc/lispref/lists.texi 2011-05-19 07:23:18 +0000
+++ b/doc/lispref/lists.texi 2011-05-29 22:41:06 +0000
@@ -1355,10 +1355,10 @@
(delq '(4) sample-list)
@result{} (a c (4))
@end group
address@hidden example
If you want to delete elements that are @code{equal} to a given value,
use @code{delete} (see below).
address@hidden example
@defun remq object list
This function returns a copy of @var{list}, with all elements removed
=== modified file 'doc/lispref/minibuf.texi'
--- a/doc/lispref/minibuf.texi 2011-05-28 19:58:43 +0000
+++ b/doc/lispref/minibuf.texi 2011-05-29 22:41:06 +0000
@@ -837,12 +837,13 @@
@code{risky-local-variable} property. @xref{File Local Variables}.
@defvar completion-ignore-case
-If the value of this variable is address@hidden, Emacs does not
-consider case significant in completion. Note, however, that this
-variable is overridden by @code{read-file-name-completion-ignore-case}
-within @code{read-file-name} (@pxref{Reading File Names}), and by
address@hidden within @code{read-buffer}
-(@pxref{High-Level Completion}).
+If the value of this variable is address@hidden, case is not
+considered significant in completion. Within @code{read-file-name},
+this variable is overridden by
address@hidden (@pxref{Reading File
+Names}); within @code{read-buffer}, it is overridden by
address@hidden (@pxref{High-Level
+Completion}).
@end defvar
@defvar completion-regexp-list
=== modified file 'doc/lispref/modes.texi'
--- a/doc/lispref/modes.texi 2011-05-27 01:43:15 +0000
+++ b/doc/lispref/modes.texi 2011-05-29 22:41:06 +0000
@@ -1046,8 +1046,8 @@
@end group
@group
;; @r{These four lines are absent from the current version}
- ;; @r{not because this is done some other way, but rather}
- ;; @r{because nowadays Text mode uses the normal definition of paragraphs.}
+ ;; @r{not because this is done some other way, but because}
+ ;; @r{nowadays Text mode uses the normal definition of paragraphs.}
(set (make-local-variable 'paragraph-start)
(concat "[ \t]*$\\|" page-delimiter))
(set (make-local-variable 'paragraph-separate) paragraph-start)
@@ -1139,12 +1139,15 @@
@smallexample
@group
- (set (make-local-variable 'paragraph-start) (concat page-delimiter "\\|$" ))
- (set (make-local-variable 'paragraph-separate) paragraph-start)
+ (set (make-local-variable 'paragraph-start)
+ (concat page-delimiter "\\|$" ))
+ (set (make-local-variable 'paragraph-separate)
+ paragraph-start)
@dots{}
@end group
@group
- (set (make-local-variable 'comment-indent-function) 'lisp-comment-indent))
+ (set (make-local-variable 'comment-indent-function)
+ 'lisp-comment-indent))
@dots{}
@end group
@end smallexample
@@ -3619,7 +3622,9 @@
(inst ("IF" exp "THEN" insts "ELSE" insts "END")
("CASE" exp "OF" cases "END")
...)
- (cases (cases "|" cases) (caselabel ":" insts) ("ELSE" insts))
+ (cases (cases "|" cases)
+ (caselabel ":" insts)
+ ("ELSE" insts))
...
@end example
@@ -3894,9 +3899,10 @@
rule:
@example
((equal token "if")
- (and (not (smie-rule-bolp)) (smie-rule-prev-p "else")
+ (and (not (smie-rule-bolp))
+ (smie-rule-prev-p "else")
(save-excursion
- (sample-smie-backward-token) ;Jump before the "else".
+ (sample-smie-backward-token)
(cons 'column (current-column)))))
@end example
=== modified file 'doc/lispref/nonascii.texi'
--- a/doc/lispref/nonascii.texi 2011-05-19 06:54:27 +0000
+++ b/doc/lispref/nonascii.texi 2011-05-29 22:41:06 +0000
@@ -374,18 +374,18 @@
@table @code
@item name
-This property corresponds to the Unicode @code{Name} property. The
-value is a string consisting of upper-case Latin letters A to Z,
-digits, spaces, and hyphen @samp{-} characters.
+Corresponds to the @code{Name} Unicode property. The value is a
+string consisting of upper-case Latin letters A to Z, digits, spaces,
+and hyphen @samp{-} characters.
@cindex unicode general category
@item general-category
-This property corresponds to the Unicode @code{General_Category}
-property. The value is a symbol whose name is a 2-letter abbreviation
-of the character's classification.
+Corresponds to the @code{General_Category} Unicode property. The
+value is a symbol whose name is a 2-letter abbreviation of the
+character's classification.
@item canonical-combining-class
-Corresponds to the Unicode @code{Canonical_Combining_Class} property.
+Corresponds to the @code{Canonical_Combining_Class} Unicode property.
The value is an integer number.
@item bidi-class
@@ -466,15 +466,18 @@
@result{} Nd
@end group
@group
-(get-char-code-property ?\u2084 'digit-value) ; subscript 4
+;; subscript 4
+(get-char-code-property ?\u2084 'digit-value)
@result{} 4
@end group
@group
-(get-char-code-property ?\u2155 'numeric-value) ; one fifth
+;; one fifth
+(get-char-code-property ?\u2155 'numeric-value)
@result{} 0.2
@end group
@group
-(get-char-code-property ?\u2163 'numeric-value) ; Roman IV
+;; Roman IV
+(get-char-code-property ?\u2163 'numeric-value)
@result{} 4
@end group
@end example
@@ -1449,11 +1452,11 @@
@var{encoding-system} is the coding system for encoding (in case
@var{operation} does encoding).
-The argument @var{operation} is a symbol, one of @code{write-region},
address@hidden, @code{call-process}, @code{call-process-region},
address@hidden, or @code{open-network-stream}. These are
-the names of the Emacs I/O primitives that can do character code and
-eol conversion.
+The argument @var{operation} is a symbol; it should be one of
address@hidden, @code{start-process}, @code{call-process},
address@hidden, @code{insert-file-contents}, or
address@hidden These are the names of the Emacs I/O
+primitives that can do character code and eol conversion.
The remaining arguments should be the same arguments that might be given
to the corresponding I/O primitive. Depending on the primitive, one
=== modified file 'doc/lispref/processes.texi'
--- a/doc/lispref/processes.texi 2011-05-01 00:04:17 +0000
+++ b/doc/lispref/processes.texi 2011-05-29 22:41:06 +0000
@@ -1794,9 +1794,9 @@
The number of threads in the process.
@item start
-The time the process was started, in the @address@hidden(@var{high}
address@hidden @var{microsec})}} format used by @code{current-time} and
address@hidden
+The time when the process was started, in the same
address@hidden@code{(@var{high} @var{low} @var{microsec})}} format used by
address@hidden and @code{file-attributes}.
@item etime
The time elapsed since the process started, in the @address@hidden(@var{high}
@@ -2482,25 +2482,17 @@
@itemx :parity
@itemx :stopbits
@itemx :flowcontrol
-These arguments are handled by @code{serial-process-configure}, which
-is called by @code{make-serial-process}.
+These are handled by @code{serial-process-configure}, which is called
+by @code{make-serial-process}.
@end table
The original argument list, possibly modified by later configuration,
is available via the function @code{process-contact}.
-Examples:
+Here is an example:
@example
(make-serial-process :port "/dev/ttyS0" :speed 9600)
-
-(make-serial-process :port "COM1" :speed 115200 :stopbits 2)
-
-(make-serial-process :port "\\\\.\\COM13" :speed 1200
- :bytesize 7 :parity 'odd)
-
-(make-serial-process :port "/dev/tty.BlueConsole-SPP-1"
- :speed nil)
@end example
@end defun
@@ -2560,19 +2552,9 @@
flow control.
@end table
address@hidden is called by @code{make-serial-process} for the
-initial configuration of the serial port.
-
-Examples:
-
address@hidden
-(serial-process-configure :process "/dev/ttyS0" :speed 1200)
-
-(serial-process-configure :buffer "COM1" :stopbits 1
- :parity 'odd :flowcontrol 'hw)
-
-(serial-process-configure :port "\\\\.\\COM13" :bytesize 7)
address@hidden example
address@hidden is called by
address@hidden for the initial configuration of the serial
+port.
@end defun
@node Byte Packing
=== modified file 'doc/lispref/strings.texi'
--- a/doc/lispref/strings.texi 2011-03-19 18:49:31 +0000
+++ b/doc/lispref/strings.texi 2011-05-29 22:41:06 +0000
@@ -828,12 +828,12 @@
@example
@group
-(format "The word `%7s' actually has %d letters in it."
+(format "The word `%7s' has %d letters in it."
"foo" (length "foo"))
- @result{} "The word ` foo' actually has 3 letters in it."
-(format "The word `%7s' actually has %d letters in it."
+ @result{} "The word ` foo' has 3 letters in it."
+(format "The word `%7s' has %d letters in it."
"specification" (length "specification"))
- @result{} "The word `specification' actually has 13 letters in it."
+ @result{} "The word `specification' has 13 letters in it."
@end group
@end example
=== modified file 'doc/lispref/text.texi'
--- a/doc/lispref/text.texi 2011-05-19 06:54:27 +0000
+++ b/doc/lispref/text.texi 2011-05-29 22:41:06 +0000
@@ -2806,9 +2806,9 @@
@end smallexample
@end defun
- See also the function @code{buffer-substring-no-properties}
-(@pxref{Buffer Contents}) which copies text from the buffer
-but does not copy its properties.
+ @xref{Buffer Contents}, for the function
address@hidden, which copies text from the
+buffer but does not copy its properties.
@node Property Search
@subsection Text Property Search Functions
@@ -2992,13 +2992,6 @@
attribute. With this feature, you do not need to create a face each
time you want to specify a particular attribute for certain text.
@xref{Face Attributes}.
-
address@hidden
-A cons cell with the form @code{(foreground-color . @var{color-name})}
-or @code{(background-color . @var{color-name})}. These are old,
-deprecated equivalents for @code{(:foreground @var{color-name})} and
address@hidden(:background @var{color-name})}. Please convert code that uses
-them.
@end itemize
It works to use the latter two forms directly as the value
=== modified file 'doc/lispref/tips.texi'
--- a/doc/lispref/tips.texi 2011-05-28 19:05:36 +0000
+++ b/doc/lispref/tips.texi 2011-05-29 22:41:06 +0000
@@ -249,7 +249,8 @@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+;; along with this program. If not, see
+;; <http://www.gnu.org/licenses/>.
@end smallexample
If you have signed papers to assign the copyright to the Foundation,
=== modified file 'doc/lispref/windows.texi'
--- a/doc/lispref/windows.texi 2011-05-19 06:54:27 +0000
+++ b/doc/lispref/windows.texi 2011-05-29 22:41:06 +0000
@@ -1462,10 +1462,10 @@
selected window. If @var{position} is @code{t}, that means to check the
last visible position in @var{window}.
-The @code{pos-visible-in-window-p} function considers only vertical
-scrolling. If @var{position} is out of view only because @var{window}
-has been scrolled horizontally, @code{pos-visible-in-window-p} returns
address@hidden anyway. @xref{Horizontal Scrolling}.
+This function considers only vertical scrolling. If @var{position} is
+out of view only because @var{window} has been scrolled horizontally,
address@hidden returns address@hidden anyway.
address@hidden Scrolling}.
If @var{position} is visible, @code{pos-visible-in-window-p} returns
@code{t} if @var{partially} is @code{nil}; if @var{partially} is
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104429: Merge from emacs-23; up to r100589.,
Glenn Morris <=