emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r104283: Misc small lispref fixes.


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r104283: Misc small lispref fixes.
Date: Wed, 18 May 2011 23:54:27 -0700
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 104283
author: Nix <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-18 23:54:27 -0700
message:
  Misc small lispref fixes.
  
  * windows.texi (Displaying Buffers): pop-to-buffer is not a command.
  
  * text.texi (Parsing HTML): Update for function name changes.
  
  * syntax.texi (Syntax Flags): Small fix.
  
  * keymaps.texi (Active Keymaps): Typo fix.
  (Changing Key Bindings): Grammar fix.
  
  * frames.texi (Minibuffers and Frames): Grammar fix.
  (Window System Selections): x-select-enable-clipboard now defaults to t.
  
  * customize.texi (Common Keywords):
  * display.texi (Abstract Display):
  * modes.texi (Auto-Indentation):
  * nonascii.texi (Converting Representations): Typo fixes.
  
  * control.texi (Examples of Catch): Call it "goto" not "go to".
modified:
  doc/lispref/ChangeLog
  doc/lispref/control.texi
  doc/lispref/customize.texi
  doc/lispref/display.texi
  doc/lispref/frames.texi
  doc/lispref/keymaps.texi
  doc/lispref/modes.texi
  doc/lispref/nonascii.texi
  doc/lispref/syntax.texi
  doc/lispref/text.texi
  doc/lispref/windows.texi
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-05-14 14:50:46 +0000
+++ b/doc/lispref/ChangeLog     2011-05-19 06:54:27 +0000
@@ -1,3 +1,24 @@
+2011-05-19  Nix  <address@hidden>
+
+       * windows.texi (Displaying Buffers): pop-to-buffer is not a command.
+
+       * text.texi (Parsing HTML): Update for function name changes.
+
+       * syntax.texi (Syntax Flags): Small fix.
+
+       * keymaps.texi (Active Keymaps): Typo fix.
+       (Changing Key Bindings): Grammar fix.
+
+       * frames.texi (Minibuffers and Frames): Grammar fix.
+       (Window System Selections): x-select-enable-clipboard now defaults to t.
+
+       * customize.texi (Common Keywords):
+       * display.texi (Abstract Display):
+       * modes.texi (Auto-Indentation):
+       * nonascii.texi (Converting Representations): Typo fixes.
+
+       * control.texi (Examples of Catch): Call it "goto" not "go to".
+
 2011-05-14  Eli Zaretskii  <address@hidden>
 
        * nonascii.texi (Character Properties): Fix inconsistencies with

=== modified file 'doc/lispref/control.texi'
--- a/doc/lispref/control.texi  2011-01-25 04:08:28 +0000
+++ b/doc/lispref/control.texi  2011-05-19 06:54:27 +0000
@@ -623,7 +623,7 @@
 @subsection Examples of @code{catch} and @code{throw}
 
   One way to use @code{catch} and @code{throw} is to exit from a doubly
-nested loop.  (In most languages, this would be done with a ``go to.'')
+nested loop.  (In most languages, this would be done with a ``goto.'')
 Here we compute @code{(foo @var{i} @var{j})} for @var{i} and @var{j}
 varying from 0 to 9:
 

=== modified file 'doc/lispref/customize.texi'
--- a/doc/lispref/customize.texi        2011-01-25 04:08:28 +0000
+++ b/doc/lispref/customize.texi        2011-05-19 06:54:27 +0000
@@ -174,7 +174,7 @@
 
 The value of @var{package} needs to be unique and it needs to match
 the @var{package} value appearing in the @code{:package-version}
-keyword.  Since the user might see the value in a error message, a good
+keyword.  Since the user might see the value in an error message, a good
 choice is the official name of the package, such as MH-E or Gnus.
 @end defvar
 

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2011-05-12 07:27:35 +0000
+++ b/doc/lispref/display.texi  2011-05-19 06:54:27 +0000
@@ -5201,7 +5201,7 @@
   Typically, you define an ewoc with @code{ewoc-create}, and then pass
 the resulting ewoc structure to other functions in the Ewoc package to
 build nodes within it, and display it in the buffer.  Once it is
-displayed in the buffer, other functions determine the correspondance
+displayed in the buffer, other functions determine the correspondence
 between buffer positions and nodes, move point from one node's textual
 representation to another, and so forth.  @xref{Abstract Display
 Functions}.

=== modified file 'doc/lispref/frames.texi'
--- a/doc/lispref/frames.texi   2011-04-23 03:07:16 +0000
+++ b/doc/lispref/frames.texi   2011-05-19 06:54:27 +0000
@@ -1368,7 +1368,7 @@
 
 However, you can also create a frame with no minibuffer.  Such a frame
 must use the minibuffer window of some other frame.  When you create the
-frame, you can specify explicitly the minibuffer window to use (in some
+frame, you can explicitly specify the minibuffer window to use (in some
 other frame).  If you don't, then the minibuffer is found in the frame
 which is the value of the variable @code{default-minibuffer-frame}.  Its
 value should be a frame that does have a minibuffer.
@@ -2018,8 +2018,8 @@
 If this is address@hidden, the Emacs yank functions consult the
 clipboard before the primary selection, and the kill functions store in
 the clipboard as well as the primary selection.  Otherwise they do not
-access the clipboard at all.  The default is @code{nil} on most systems,
-but @code{t} on MS-Windows.
+access the clipboard at all.  The default is @code{t} on systems with
+clipboards.
 @end defopt
 
 @node Drag and Drop

=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi  2011-03-19 18:49:31 +0000
+++ b/doc/lispref/keymaps.texi  2011-05-19 06:54:27 +0000
@@ -686,7 +686,7 @@
 
 When commands are remapped (@pxref{Remapping Commands}),
 @code{key-binding} normally processes command remappings so as to
-returns the remapped command that will actually be executed.  However,
+return the remapped command that will actually be executed.  However,
 if @var{no-remap} is address@hidden, @code{key-binding} ignores
 remappings and returns the binding directly specified for @var{key}.
 
@@ -1239,7 +1239,7 @@
 The @code{global-set-key} and @code{local-set-key} functions are
 convenient interfaces for these operations (@pxref{Key Binding
 Commands}).  You can also use @code{define-key}, a more general
-function; then you must specify explicitly the map to change.
+function; then you must explicitly specify the map to change.
 
   When choosing the key sequences for Lisp programs to rebind, please
 follow the Emacs conventions for use of various keys (@pxref{Key

=== modified file 'doc/lispref/modes.texi'
--- a/doc/lispref/modes.texi    2011-05-12 07:07:06 +0000
+++ b/doc/lispref/modes.texi    2011-05-19 06:54:27 +0000
@@ -3256,7 +3256,7 @@
 @end defvar
 
 @node Auto-Indentation
address@hidden Auto-indention of code
address@hidden Auto-indentation of code
 
 For programming languages, an important feature of a major mode is to
 provide automatic indentation.  This is controlled in Emacs by

=== modified file 'doc/lispref/nonascii.texi'
--- a/doc/lispref/nonascii.texi 2011-05-14 14:50:46 +0000
+++ b/doc/lispref/nonascii.texi 2011-05-19 06:54:27 +0000
@@ -201,7 +201,7 @@
 @defun byte-to-string byte
 @cindex byte to string
 This function returns a unibyte string containing a single byte of
-character data, @var{character}.  It signals a error if
+character data, @var{character}.  It signals an error if
 @var{character} is not an integer between 0 and 255.
 @end defun
 

=== modified file 'doc/lispref/syntax.texi'
--- a/doc/lispref/syntax.texi   2011-01-25 04:08:28 +0000
+++ b/doc/lispref/syntax.texi   2011-05-19 06:54:27 +0000
@@ -374,7 +374,7 @@
 
 @item @samp{*/}
 This is a comment-end sequence for ``b'' style because the first
-character, @samp{*}, does have the @samp{b} flag.
+character, @samp{*}, has the @samp{b} flag.
 
 @item newline
 This is a comment-end sequence for ``a'' style, because the newline

=== modified file 'doc/lispref/text.texi'
--- a/doc/lispref/text.texi     2011-05-14 08:46:11 +0000
+++ b/doc/lispref/text.texi     2011-05-19 06:54:27 +0000
@@ -4099,17 +4099,16 @@
 @node Parsing HTML
 @section Parsing HTML
 @cindex parsing html
address@hidden parsing xml
-
-Emacs provides an interface to the @code{libxml2} library via two
-functions: @code{html-parse-buffer} and @code{xml-parse-buffer}.  The
-HTML function will parse ``real world'' HTML and try to return a
-sensible parse tree, while the XML function is somewhat stricter about
-syntax.
-
-They both take a two optional parameter.  The first is a buffer, and
-the second is a base URL to be used to expand relative URLs in the
-document, if any.
+
address@hidden libxml-parse-html-region start end &optional base-url
+This function provides HTML parsing via the @code{libxml2} library.
+It parses ``real world'' HTML and tries to return a sensible parse tree
+regardless.
+
+In addition to @var{start} and @var{end} (specifying the start and end
+of the region to act on), it takes an optional parameter,
address@hidden, which is used to expand relative URLs in the document,
+if any.
 
 Here's an example demonstrating the structure of the parsed data you
 get out.  Given this HTML document:
@@ -4138,12 +4137,21 @@
 
 Attributes are coded the same way as child nodes, but with @samp{:} as
 the first character.
address@hidden defun
+
address@hidden parsing xml
address@hidden libxml-parse-xml-region start end &optional base-url
+
+This is much the same as @code{libxml-parse-html-region} above, but
+operates on XML instead of HTML, and is correspondingly stricter about
+syntax.
address@hidden defun
 
 @node Atomic Changes
 @section Atomic Change Groups
 @cindex atomic changes
 
-  In data base terminology, an @dfn{atomic} change is an indivisible
+  In database terminology, an @dfn{atomic} change is an indivisible
 change---it can succeed entirely or it can fail entirely, but it
 cannot partly succeed.  A Lisp program can make a series of changes to
 one or several buffers as an @dfn{atomic change group}, meaning that

=== modified file 'doc/lispref/windows.texi'
--- a/doc/lispref/windows.texi  2011-04-23 03:07:16 +0000
+++ b/doc/lispref/windows.texi  2011-05-19 06:54:27 +0000
@@ -826,8 +826,8 @@
 unless @var{norecord} is address@hidden
 @end deffn
 
address@hidden Command pop-to-buffer buffer-or-name &optional other-window 
norecord
-This command makes @var{buffer-or-name} the current buffer and switches
address@hidden pop-to-buffer buffer-or-name &optional other-window norecord
+This function makes @var{buffer-or-name} the current buffer and switches
 to it in some window, preferably not the window previously selected.
 The ``popped-to'' window becomes the selected window.  Its frame is
 given the X server's focus, if possible; see @ref{Input Focus}.  The
@@ -866,7 +866,7 @@
 
 This function updates the buffer list just like @code{switch-to-buffer}
 unless @var{norecord} is address@hidden
address@hidden deffn
address@hidden defun
 
 @deffn Command replace-buffer-in-windows &optional buffer-or-name
 This function replaces @var{buffer-or-name} in all windows displaying


reply via email to

[Prev in Thread] Current Thread [Next in Thread]